[Libreoffice-commits] core.git: sd/inc sd/source
Stephan Bergmann
sbergman at redhat.com
Mon Apr 14 08:56:06 PDT 2014
sd/inc/Annotation.hxx | 42 ++
sd/inc/AnnotationEnumeration.hxx | 39 ++
sd/inc/createpresentation.hxx | 37 +
sd/inc/createunocustomshow.hxx | 32 +
sd/inc/createunopageimpl.hxx | 29 +
sd/inc/notifydocumentevent.hxx | 33 +
sd/inc/randomnode.hxx | 34 +
sd/source/core/CustomAnimationCloner.cxx | 1
sd/source/core/CustomAnimationEffect.cxx | 6
sd/source/core/annotations/Annotation.cxx | 13
sd/source/core/annotations/AnnotationEnumeration.cxx | 7
sd/source/core/cusshow.cxx | 3
sd/source/core/drawdoc_animations.cxx | 4
sd/source/core/sdpage.cxx | 3
sd/source/core/sdpage2.cxx | 10
sd/source/core/undoanim.cxx | 10
sd/source/filter/html/HtmlOptionsDialog.cxx | 2
sd/source/filter/ppt/pptinanimations.cxx | 6
sd/source/filter/xml/sdtransform.cxx | 1
sd/source/filter/xml/sdtransform.hxx | 29 +
sd/source/filter/xml/sdxmlwrp.cxx | 3
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 1
sd/source/ui/animations/CustomAnimationPane.hxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 10
sd/source/ui/app/sddll.cxx | 5
sd/source/ui/controller/slidelayoutcontroller.cxx | 9
sd/source/ui/dlg/dlgass.cxx | 1
sd/source/ui/dlg/headerfooterdlg.cxx | 16
sd/source/ui/docshell/docshell.cxx | 2
sd/source/ui/framework/configuration/Configuration.cxx | 4
sd/source/ui/framework/configuration/ConfigurationController.cxx | 3
sd/source/ui/framework/configuration/ResourceId.cxx | 4
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 3
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 3
sd/source/ui/framework/factories/BasicViewFactory.cxx | 3
sd/source/ui/framework/factories/PresentationFactory.cxx | 3
sd/source/ui/framework/module/ModuleController.cxx | 4
sd/source/ui/inc/createcustomanimationpanel.hxx | 33 +
sd/source/ui/inc/createslidetransitionpanel.hxx | 33 +
sd/source/ui/inc/createtabledesignpanel.hxx | 33 +
sd/source/ui/inc/createtableobjectbar.hxx | 38 ++
sd/source/ui/inc/facreg.hxx | 187 ++++++++++
sd/source/ui/inc/registerinterfaces.hxx | 33 +
sd/source/ui/inc/tablefunction.hxx | 33 +
sd/source/ui/presenter/PresenterCanvas.cxx | 3
sd/source/ui/presenter/PresenterHelper.cxx | 3
sd/source/ui/presenter/PresenterPreviewCache.cxx | 3
sd/source/ui/presenter/PresenterTextView.cxx | 3
sd/source/ui/presenter/SlideRenderer.cxx | 3
sd/source/ui/remotecontrol/ImagePreparer.cxx | 117 ------
sd/source/ui/sidebar/CustomAnimationPanel.cxx | 6
sd/source/ui/sidebar/MasterPageObserver.cxx | 26 -
sd/source/ui/sidebar/PanelFactory.cxx | 3
sd/source/ui/sidebar/SlideTransitionPanel.cxx | 9
sd/source/ui/sidebar/TableDesignPanel.cxx | 7
sd/source/ui/slideshow/slideshow.cxx | 1
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 2
sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 8
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 3
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 1
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 3
sd/source/ui/table/TableDesignPane.cxx | 1
sd/source/ui/table/TableDesignPane.hxx | 2
sd/source/ui/table/tablefunction.cxx | 3
sd/source/ui/table/tableobjectbar.cxx | 2
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 3
sd/source/ui/unoidl/facreg.cxx | 159 --------
sd/source/ui/unoidl/randomnode.cxx | 2
sd/source/ui/unoidl/unocpres.cxx | 1
sd/source/ui/unoidl/unodoc.cxx | 1
sd/source/ui/unoidl/unomodel.cxx | 6
sd/source/ui/unoidl/unomodule.cxx | 1
sd/source/ui/unoidl/unoobj.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 7
sd/source/ui/unoidl/unopool.cxx | 1
sd/source/ui/unoidl/unopool.hxx | 30 +
sd/source/ui/view/ViewShellManager.cxx | 2
sd/source/ui/view/ViewTabBar.cxx | 17
sd/source/ui/view/sdview3.cxx | 3
sd/source/ui/view/viewoverlaymanager.cxx | 4
sd/source/ui/view/viewshel.cxx | 5
83 files changed, 799 insertions(+), 465 deletions(-)
New commits:
commit 1531b523bf6a3379739d2ec12c96ca7b94f60a65
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 14 17:55:19 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I7a2b5970fd0ab2059b5f5b0100a049e04ba54ee3
diff --git a/sd/inc/Annotation.hxx b/sd/inc/Annotation.hxx
new file mode 100644
index 0000000..fe2f39a
--- /dev/null
+++ b/sd/inc/Annotation.hxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_INC_ANNOTATION_HXX
+#define INCLUDED_SD_INC_ANNOTATION_HXX
+
+#include <sal/config.h>
+
+class SdPage;
+class SdrUndoAction;
+
+namespace com { namespace sun { namespace star { namespace office {
+ class XAnnotation;
+} } } }
+
+namespace sd {
+
+void createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation, SdPage* pPage );
+
+SdrUndoAction* CreateUndoInsertOrRemoveAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, bool bInsert );
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/AnnotationEnumeration.hxx b/sd/inc/AnnotationEnumeration.hxx
new file mode 100644
index 0000000..e986f1c
--- /dev/null
+++ b/sd/inc/AnnotationEnumeration.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_INC_ANNOTATIONENUMERATION_HXX
+#define INCLUDED_SD_INC_ANNOTATIONENUMERATION_HXX
+
+#include <sal/config.h>
+
+#include <sdpage.hxx>
+
+namespace com { namespace sun { namespace star { namespace office {
+ class XAnnotationEnumeration;
+} } } }
+
+namespace sd {
+
+css::uno::Reference< css::office::XAnnotationEnumeration > createAnnotationEnumeration( const AnnotationVector& );
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/createpresentation.hxx b/sd/inc/createpresentation.hxx
new file mode 100644
index 0000000..8413870
--- /dev/null
+++ b/sd/inc/createpresentation.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_INC_CREATEPRESENTATION_HXX
+#define INCLUDED_SD_INC_CREATEPRESENTATION_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace presentation {
+ class XPresentation2;
+} } } }
+class SdDrawDocument;
+
+css::uno::Reference<css::presentation::XPresentation2> CreatePresentation(
+ SdDrawDocument const & rDocument);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/createunocustomshow.hxx b/sd/inc/createunocustomshow.hxx
new file mode 100644
index 0000000..501f863
--- /dev/null
+++ b/sd/inc/createunocustomshow.hxx
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_INC_CREATEUNOCUSTOMSHOW_HXX
+#define INCLUDED_SD_INC_CREATEUNOCUSTOMSHOW_HXX
+
+#include <sal/config.h>
+
+class SdCustomShow;
+
+css::uno::Reference<css::uno::XInterface> createUnoCustomShow(
+ SdCustomShow * pShow);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/createunopageimpl.hxx b/sd/inc/createunopageimpl.hxx
new file mode 100644
index 0000000..75702bc
--- /dev/null
+++ b/sd/inc/createunopageimpl.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_INC_CREATEUNOPAGEIMPL_HXX
+#define INCLUDED_SD_INC_CREATEUNOPAGEIMPL_HXX
+
+#include <sal/config.h>
+
+css::uno::Reference< css::uno::XInterface > createUnoPageImpl( SdPage* pPage );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/notifydocumentevent.hxx b/sd/inc/notifydocumentevent.hxx
new file mode 100644
index 0000000..1a06898
--- /dev/null
+++ b/sd/inc/notifydocumentevent.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_INC_NOTIFYDOCUMENTEVENT_HXX
+#define INCLUDED_SD_INC_NOTIFYDOCUMENTEVENT_HXX
+
+#include <sal/config.h>
+
+class SdDrawDocument;
+
+void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName );
+
+void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const css::uno::Reference< css::uno::XInterface >& xSource );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/randomnode.hxx b/sd/inc/randomnode.hxx
new file mode 100644
index 0000000..4496fd9
--- /dev/null
+++ b/sd/inc/randomnode.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_INC_RANDOMNODE_HXX
+#define INCLUDED_SD_INC_RANDOMNODE_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+css::uno::Reference<css::uno::XInterface> RandomAnimationNode_createInstance(
+ sal_Int16 nPresetClass);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 0ab6679..b71f9e7 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -45,6 +45,7 @@
// header for class SdrObjListIter
#include <svx/svditer.hxx>
+#include "CustomAnimationCloner.hxx"
#include "sdpage.hxx"
using namespace ::com::sun::star::uno;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index b1639a9..95b9534 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2355,12 +2355,6 @@ void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect )
}
}
-class TextGroupMapImpl : public std::map< sal_Int32, CustomAnimationTextGroup* >
-{
-public:
- CustomAnimationTextGroup* findGroup( sal_Int32 nGroupId );
-};
-
CustomAnimationTextGroupPtr EffectSequenceHelper::findGroup( sal_Int32 nGroupId )
{
CustomAnimationTextGroupPtr aPtr;
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 736661f..70f2a0f 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -17,9 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+#include "boost/noncopyable.hpp"
#include "osl/time.h"
-#include "sal/config.h"
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/office/XAnnotation.hpp>
@@ -30,7 +31,9 @@
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
+#include "Annotation.hxx"
#include "drawdoc.hxx"
+#include "notifydocumentevent.hxx"
#include "sdpage.hxx"
#include "textapi.hxx"
@@ -44,13 +47,12 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star;
-extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const Reference< XInterface >& xSource );
-
namespace sd {
class Annotation : private ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper1< XAnnotation>,
- public ::cppu::PropertySetMixin< XAnnotation >
+ public ::cppu::PropertySetMixin< XAnnotation >,
+ private boost::noncopyable
{
public:
explicit Annotation( const Reference< XComponentContext >& context, SdPage* pPage );
@@ -85,9 +87,6 @@ public:
virtual Reference< XText > SAL_CALL getTextRange() throw (RuntimeException, std::exception) SAL_OVERRIDE;
private:
- Annotation(const Annotation &); // not defined
- Annotation& operator=(const Annotation &); // not defined
-
// destructor is private and will be called indirectly by the release call virtual ~Annotation() {}
void createChangeUndo();
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx
index 6b5ae2f..c9afdbd 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -20,11 +20,13 @@
#include "sal/config.h"
+#include "boost/noncopyable.hpp"
#include "cppuhelper/implbase1.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/office/XAnnotationEnumeration.hpp"
+#include "AnnotationEnumeration.hxx"
#include "sdpage.hxx"
using namespace ::com::sun::star::uno;
@@ -34,7 +36,7 @@ using namespace ::com::sun::star::lang;
namespace sd {
-class AnnotationEnumeration: public ::cppu::WeakImplHelper1< css::office::XAnnotationEnumeration >
+class AnnotationEnumeration: public ::cppu::WeakImplHelper1< css::office::XAnnotationEnumeration >, private boost::noncopyable
{
public:
AnnotationEnumeration( const AnnotationVector& rAnnotations );
@@ -44,9 +46,6 @@ public:
virtual css::uno::Reference< css::office::XAnnotation > SAL_CALL nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception) SAL_OVERRIDE;
private:
- AnnotationEnumeration(const AnnotationEnumeration &); // not defined
- AnnotationEnumeration& operator=(const AnnotationEnumeration &); // not defined
-
// destructor is private and will be called indirectly by the release call virtual ~AnnotationEnumeration() {}
AnnotationVector maAnnotations;
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index 9cecb6d..a63df61 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/lang/XComponent.hpp>
+#include "createunocustomshow.hxx"
#include "sdiocmpt.hxx"
#include "cusshow.hxx"
#include "sdpage.hxx"
@@ -71,8 +72,6 @@ SdCustomShow::~SdCustomShow()
xComponent->dispose();
}
-extern uno::Reference< uno::XInterface > createUnoCustomShow( SdCustomShow* pShow );
-
uno::Reference< uno::XInterface > SdCustomShow::getUnoCustomShow()
{
// try weak reference first
diff --git a/sd/source/core/drawdoc_animations.cxx b/sd/source/core/drawdoc_animations.cxx
index 425644a..28de082 100644
--- a/sd/source/core/drawdoc_animations.cxx
+++ b/sd/source/core/drawdoc_animations.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include "createpresentation.hxx"
#include "drawdoc.hxx"
#include "cusshow.hxx"
#include "customshowlist.hxx"
@@ -40,8 +42,6 @@ void SdDrawDocument::ReplacePageInCustomShows( const SdPage* pOldPage, const SdP
}
}
-extern Reference< XPresentation2 > CreatePresentation( const SdDrawDocument& rDocument );
-
const Reference< XPresentation2 >& SdDrawDocument::getPresentation() const
{
if( !mxPresentation.is() )
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bdb3c0b..4393771 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -57,6 +57,7 @@
#include "../ui/inc/DrawDocShell.hxx"
#include "Outliner.hxx"
#include "app.hrc"
+#include "createunopageimpl.hxx"
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "pglink.hxx"
@@ -2661,8 +2662,6 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) const
return aString;
}
-extern uno::Reference< uno::XInterface > createUnoPageImpl( SdPage* pPage );
-
uno::Reference< uno::XInterface > SdPage::createUnoPage()
{
return createUnoPageImpl( this );
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 409ff8a..738f745 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -31,6 +31,8 @@
#include <editeng/xmlcnitm.hxx>
#include <svx/svditer.hxx>
+#include "Annotation.hxx"
+#include "notifydocumentevent.hxx"
#include "sdresid.hxx"
#include "sdpage.hxx"
#include "glob.hxx"
@@ -52,8 +54,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::office;
-extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName, const Reference< XInterface >& xSource );
-
/*************************************************************************
|*
|* Sets: names of layout, master page links and templates for presentation
@@ -608,12 +608,6 @@ sal_Int32 SdPage::getHash() const
return stringify().hashCode();
}
-
-namespace sd {
-extern void createAnnotation( Reference< XAnnotation >& xAnnotation, SdPage* pPage );
-extern SdrUndoAction* CreateUndoInsertOrRemoveAnnotation( const Reference< XAnnotation >& xAnnotation, bool bInsert );
-}
-
void SdPage::createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation )
{
sd::createAnnotation( xAnnotation, this );
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index d52bf4d..8dad60b 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/animations/XAnimationNode.hpp>
#include "CustomAnimationCloner.hxx"
@@ -110,7 +113,7 @@ OUString UndoAnimation::GetComment() const
return SdResId(STR_UNDO_ANIMATION).toString();
}
-struct UndoAnimationPathImpl
+struct UndoAnimationPathImpl: private boost::noncopyable
{
SdPage* mpPage;
sal_Int32 mnEffectOffset;
@@ -147,11 +150,6 @@ struct UndoAnimationPathImpl
}
return pEffect;
}
-
- private:
- UndoAnimationPathImpl( const UndoAnimationPathImpl& ); //not implemented
- const UndoAnimationPathImpl& operator=( const UndoAnimationPathImpl& ); // not implemented
-
};
UndoAnimationPath::UndoAnimationPath( SdDrawDocument* pDoc, SdPage* pThePage, const com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index af23e38..d9ecbaf 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -34,6 +34,8 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
+#include <facreg.hxx>
+
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::document;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index a071150..3b8c73d 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -64,6 +64,7 @@
#include <pptinanimations.hxx>
#include <pptatom.hxx>
#include "pptin.hxx"
+#include "randomnode.hxx"
#include <algorithm>
using ::std::map;
@@ -77,11 +78,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::animations;
using namespace ::com::sun::star::presentation;
-namespace sd
-{
-extern Reference< XInterface > RandomAnimationNode_createInstance( sal_Int16 nPresetClass );
-}
-
namespace ppt
{
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index ed5eb5a..7d9bf68 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -33,6 +33,7 @@
#include "drawdoc.hxx"
#include "glob.hxx"
+#include "sdtransform.hxx"
using namespace ::com::sun::star::style;
diff --git a/sd/source/filter/xml/sdtransform.hxx b/sd/source/filter/xml/sdtransform.hxx
new file mode 100644
index 0000000..13b75c6
--- /dev/null
+++ b/sd/source/filter/xml/sdtransform.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_FILTER_XML_SDTRANSFORM_HXX
+#define INCLUDED_SD_SOURCE_FILTER_XML_SDTRANSFORM_HXX
+
+#include <sal/config.h>
+
+void TransformOOo2xDocument( SdDrawDocument* pDocument );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 6c5c919..53143f6 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -63,6 +63,7 @@
#include "sderror.hxx"
#include "sdresid.hxx"
+#include "sdtransform.hxx"
#include "glob.hrc"
#include <sfx2/frame.hxx>
@@ -75,8 +76,6 @@ using namespace comphelper;
#define SD_XML_READERROR 1234
-extern void TransformOOo2xDocument( SdDrawDocument* pDocument );
-
char const sXML_metaStreamName[] = "meta.xml";
char const sXML_styleStreamName[] = "styles.xml";
char const sXML_contentStreamName[] = "content.xml";
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index e7ae612..f859038 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -68,6 +68,7 @@
#include "glob.hrc"
#include "CustomAnimationDialog.hxx"
+#include "CustomAnimationPane.hxx"
#include "CustomAnimation.hrc"
#include "STLPropertySet.hxx"
@@ -94,7 +95,6 @@ using ::com::sun::star::beans::XPropertySet;
namespace sd {
-extern void fillRepeatComboBox( ListBox* pBox );
extern void fillDurationComboBox( ListBox* pBox );
extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true );
extern OUString getPropertyName( sal_Int32 nPropertyType );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index b188b6d..38ad91a 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -44,6 +44,7 @@
#include "CustomAnimationCreateDialog.hxx"
#include "CustomAnimation.hrc"
#include "CustomAnimationList.hxx"
+#include "createcustomanimationpanel.hxx"
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index bc87ea3..1f71fe0 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -177,6 +177,8 @@ private:
ScopeLock maSelectionLock;
};
+void fillRepeatComboBox( ListBox* pBox );
+
}
#endif // INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATIONPANE_HXX
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 42877a3..a3f18bf 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -21,6 +21,7 @@
#include "SlideTransitionPane.hxx"
#include "CustomAnimation.hrc"
+#include "createslidetransitionpanel.hxx"
#include "TransitionPreset.hxx"
#include "sdresid.hxx"
@@ -85,15 +86,6 @@ struct TransitionEffect
{
init();
}
- explicit TransitionEffect( sal_Int16 nType, sal_Int16 nSubType,
- sal_Bool bDirection, sal_Int32 nFadeColor ) :
- mnType( nType),
- mnSubType( nSubType ),
- mbDirection( bDirection ),
- mnFadeColor( nFadeColor )
- {
- init();
- }
explicit TransitionEffect( const SdPage & rPage ) :
mnType( rPage.getTransitionType() ),
mnSubType( rPage.getTransitionSubtype() ),
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 9b09e9c..7b6b89c 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -28,6 +28,7 @@
#include <svx/objfac3d.hxx>
#include <vcl/svapp.hxx>
+#include "registerinterfaces.hxx"
#include "sddll.hxx"
#include "app.hrc"
#include "AnimationChildWindow.hxx"
@@ -101,10 +102,6 @@
using namespace ::rtl;
using namespace ::com::sun::star;
-namespace sd { namespace ui { namespace table {
- extern void RegisterInterfaces( SfxModule* pMod );
-} } }
-
// Register all Factorys
void SdDLL::RegisterFactorys()
{
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 2e82bf8..34a5e2b 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -44,6 +44,7 @@
#include <sfx2/imagemgr.hxx>
#include "app.hrc"
+#include "facreg.hxx"
#include "glob.hrc"
#include "strings.hrc"
#include "res_bmp.hrc"
@@ -311,7 +312,7 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
-OUString SlideLayoutController_getImplementationName()
+OUString SlideLayoutController_getImplementationName() throw (css::uno::RuntimeException)
{
return OUString( "com.sun.star.comp.sd.SlideLayoutController" );
}
@@ -327,7 +328,7 @@ Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( Ru
-Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
{
return static_cast< cppu::OWeakObject * >(
new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:AssignLayout", false ));
@@ -335,7 +336,7 @@ Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Ref
-OUString InsertSlideController_getImplementationName()
+OUString InsertSlideController_getImplementationName() throw (css::uno::RuntimeException)
{
return OUString( "com.sun.star.comp.sd.InsertSlideController" );
}
@@ -351,7 +352,7 @@ Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( Ru
-Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
+Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
{
return static_cast< cppu::OWeakObject * >(
new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:InsertPage" , true ) );
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 59eab0c..3baf0d0 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -254,7 +254,6 @@ public:
OUString GetUiTextForCommand (const OUString& aCommandURL);
Image GetUiIconForCommand (const OUString& aCommandURL);
- DECL_LINK( StartScanHdl, void * );
DECL_LINK( SelectFileHdl, void * );
DECL_LINK( SelectRegionHdl, ListBox * );
DECL_LINK( UpdatePreviewHdl, void * );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index e7dd0cd..32db723 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -137,15 +137,12 @@ private:
Edit* mpTBFooter;
CheckBox* mpCBSlideNumber;
- FixedText* mpFTPageNumber;
CheckBox* mpCBNotOnTitle;
PresLayoutPreview* mpCTPreview;
- SdPage* mpCurrentPage;
SdDrawDocument* mpDoc;
- HeaderFooterDialog* mpDialog;
LanguageType meOldLanguage;
bool mbHandoutMode;
@@ -159,12 +156,9 @@ private:
void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage );
public:
- HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode );
+ HeaderFooterTabPage( ::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode );
virtual ~HeaderFooterTabPage();
- static SfxTabPage* Create( ::Window*, const SfxItemSet& );
- static sal_uInt16* GetRanges();
-
void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle );
void getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle );
void update();
@@ -210,7 +204,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent
mpTabCtrl->Show();
mnSlidesId = mpTabCtrl->GetPageId("slides");
- mpSlideTabPage = new HeaderFooterTabPage( this, mpTabCtrl, pDoc, pSlide, false );
+ mpSlideTabPage = new HeaderFooterTabPage( mpTabCtrl, pDoc, pSlide, false );
mpTabCtrl->SetTabPage( mnSlidesId, mpSlideTabPage );
Size aSiz = mpSlideTabPage->GetSizePixel();
@@ -223,7 +217,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent
}
mnNotesId = mpTabCtrl->GetPageId("notes");
- mpNotesHandoutsTabPage = new HeaderFooterTabPage( this, mpTabCtrl, pDoc, pNotes, true );
+ mpNotesHandoutsTabPage = new HeaderFooterTabPage( mpTabCtrl, pDoc, pNotes, true );
mpTabCtrl->SetTabPage( mnNotesId, mpNotesHandoutsTabPage );
get(maPBApplyToAll, "apply_all" );
@@ -427,11 +421,9 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H
-HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) :
+HeaderFooterTabPage::HeaderFooterTabPage( ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) :
TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ),
- mpCurrentPage(pActualPage),
mpDoc(pDoc),
- mpDialog(pDialog),
mbHandoutMode( bHandoutMode )
{
get(mpFTIncludeOn, "include_label");
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 573fb79..8999bdf 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -81,8 +81,6 @@ SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0))
namespace sd {
-GraphicFilter* GetGrfFilter();
-
/**
* slotmaps and definitions of SFX
*/
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index 9684d91..ace59d7 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -22,6 +22,8 @@
#include "framework/FrameworkHelper.hxx"
+#include <facreg.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
@@ -62,7 +64,7 @@ public:
//----- Service ---------------------------------------------------------------
Reference<XInterface> SAL_CALL Configuration_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
(void)rxContext;
return Reference<XInterface>(static_cast<XWeak*>(new Configuration(NULL,false)));
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 9895704..957f7ef 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -30,6 +30,7 @@
#include "ConfigurationClassifier.hxx"
#include "ViewShellBase.hxx"
#include "DrawController.hxx"
+#include "facreg.hxx"
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
@@ -44,7 +45,7 @@ using ::sd::framework::FrameworkHelper;
namespace sd { namespace framework {
Reference<XInterface> SAL_CALL ConfigurationController_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
(void)rxContext;
return static_cast<XWeak*>(new ConfigurationController());
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 7c7f2ca..a09a06d 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -27,6 +27,8 @@
#include <comphelper/processfactory.hxx>
#include <rtl/ref.hxx>
+#include <facreg.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -43,7 +45,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace sd { namespace framework {
Reference<XInterface> SAL_CALL ResourceId_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
(void)rxContext;
return Reference<XInterface>(static_cast<XWeak*>(new ::sd::framework::ResourceId()));
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 4d10a13..3c7a238 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -19,6 +19,7 @@
#include "BasicPaneFactory.hxx"
+#include "facreg.hxx"
#include "ChildWindowPane.hxx"
#include "FrameWindowPane.hxx"
@@ -86,7 +87,7 @@ public:
Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new BasicPaneFactory(rxContext)));
}
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index e05f32e..de21791 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -21,6 +21,7 @@
#include "BasicToolBarFactory.hxx"
#include "ViewTabBar.hxx"
+#include "facreg.hxx"
#include "framework/FrameworkHelper.hxx"
#include <unotools/mediadescriptor.hxx>
@@ -36,7 +37,7 @@ namespace sd { namespace framework {
Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return static_cast<XWeak*>(new BasicToolBarFactory(rxContext));
}
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 1bcd6e3..d45e5e4 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -36,6 +36,7 @@
#include "PresentationViewShell.hxx"
#include "SlideSorterViewShell.hxx"
#include "FrameView.hxx"
+#include "facreg.hxx"
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
@@ -55,7 +56,7 @@ namespace sd { namespace framework {
Reference<XInterface> SAL_CALL BasicViewFactory_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new BasicViewFactory(rxContext)));
}
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 06397651..52892f8 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -23,6 +23,7 @@
#include "framework/FrameworkHelper.hxx"
#include "DrawController.hxx"
#include "ViewShellBase.hxx"
+#include "facreg.hxx"
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <cppuhelper/compbase1.hxx>
#include <tools/diagnose_ex.h>
@@ -98,7 +99,7 @@ private:
//===== PresentationFactoryProvider service ===================================
Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new PresentationFactoryProvider(rxContext)));
}
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 568d2b0..8269c73 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -27,6 +27,8 @@
#include <tools/diagnose_ex.h>
+#include <facreg.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
@@ -66,7 +68,7 @@ public:
Reference<XInterface> SAL_CALL ModuleController_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(ModuleController::CreateInstance(rxContext), UNO_QUERY);
}
diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx
new file mode 100644
index 0000000..6054f3e
--- /dev/null
+++ b/sd/source/ui/inc/createcustomanimationpanel.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx
new file mode 100644
index 0000000..db9c607
--- /dev/null
+++ b/sd/source/ui/inc/createslidetransitionpanel.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATESLIDETRANSITIONPANEL_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx
new file mode 100644
index 0000000..ceaa882
--- /dev/null
+++ b/sd/source/ui/inc/createtabledesignpanel.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATETABLEDESIGNPANEL_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATETABLEDESIGNPANEL_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/createtableobjectbar.hxx b/sd/source/ui/inc/createtableobjectbar.hxx
new file mode 100644
index 0000000..5ed8e43
--- /dev/null
+++ b/sd/source/ui/inc/createtableobjectbar.hxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_CREATETABLEOBJECTBAR_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_CREATETABLEOBJECTBAR_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+ class View;
+ class ViewShell;
+}
+
+namespace sd { namespace ui { namespace table {
+
+SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
+
+} } }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx
new file mode 100644
index 0000000..d6be721
--- /dev/null
+++ b/sd/source/ui/inc/facreg.hxx
@@ -0,0 +1,187 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_FACREG_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_FACREG_HXX
+
+#include <sal/config.h>
+
+namespace com { namespace sun { namespace star {
+ namespace lang { class XMultiServiceFactory; }
+ namespace uno { class XComponentContext; }
+} } }
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
+OUString SdDrawingDocument_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
+OUString SdPresentationDocument_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdHtmlOptionsDialog_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString SdHtmlOptionsDialog_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SdUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString SdUnoModule_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+namespace sd
+{
+css::uno::Reference< css::uno::XInterface > SAL_CALL RandomNode_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString RandomNode__getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SlideLayoutController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString SlideLayoutController_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( css::uno::RuntimeException );
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL InsertSlideController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
+OUString InsertSlideController_getImplementationName() throw( css::uno::RuntimeException );
+css::uno::Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( css::uno::RuntimeException );
+}
+
+namespace sd { namespace framework {
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL Configuration_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString Configuration_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL ConfigurationController_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString ConfigurationController_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL ModuleController_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString ModuleController_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL BasicPaneFactory_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString BasicPaneFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL BasicToolBarFactory_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString BasicToolBarFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL BasicViewFactory_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString BasicViewFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL ResourceId_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString ResourceId_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresentationFactoryProvider_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString PresentationFactoryProvider_getImplementationName(void)
+ throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+} }
+
+namespace sd { namespace sidebar {
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PanelFactory_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString PanelFactory_getImplementationName(void) throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+} }
+
+namespace sd { namespace presenter {
+css::uno::Reference<css::uno::XInterface> SAL_CALL SlideRenderer_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString SlideRenderer_getImplementationName(void)
+ throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterCanvas_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString PresenterCanvas_getImplementationName(void)
+ throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterTextViewService_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString PresenterTextViewService_getImplementationName(void)
+ throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterHelperService_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString PresenterHelperService_getImplementationName(void)
+ throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterPreviewCache_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString PresenterPreviewCache_getImplementationName(void)
+ throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+} }
+
+
+namespace sd { namespace slidesorter {
+css::uno::Reference<css::uno::XInterface> SAL_CALL SlideSorterService_createInstance(
+ const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+ throw(css::uno::Exception);
+OUString SlideSorterService_getImplementationName(void)
+ throw (css::uno::RuntimeException);
+css::uno::Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void)
+ throw (css::uno::RuntimeException);
+} }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/registerinterfaces.hxx b/sd/source/ui/inc/registerinterfaces.hxx
new file mode 100644
index 0000000..8d30575
--- /dev/null
+++ b/sd/source/ui/inc/registerinterfaces.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_REGISTERINTERFACES_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_REGISTERINTERFACES_HXX
+
+#include <sal/config.h>
+
+namespace sd { namespace ui { namespace table {
+
+void RegisterInterfaces( SfxModule* pMod );
+
+} } }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/tablefunction.hxx b/sd/source/ui/inc/tablefunction.hxx
new file mode 100644
index 0000000..b6e14c6
--- /dev/null
+++ b/sd/source/ui/inc/tablefunction.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_INC_TABLEFUNCTION_HXX
+#define INCLUDED_SD_SOURCE_UI_INC_TABLEFUNCTION_HXX
+
+#include <sal/config.h>
+
+namespace sd {
+
+void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel );
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index f2f6ae7..e518493 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -19,6 +19,7 @@
#include "PresenterCanvas.hxx"
+#include "facreg.hxx"
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -42,7 +43,7 @@ namespace sd { namespace presenter {
//===== Service ===============================================================
Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
(void)rxContext;
return Reference<XInterface>(static_cast<XWeak*>(new PresenterCanvas()));
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index e186ac9..a50df63 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -24,6 +24,7 @@
#include "PresenterHelper.hxx"
#include "CanvasUpdateRequester.hxx"
#include "PresenterCanvas.hxx"
+#include "facreg.hxx"
#include <cppcanvas/vclfactory.hxx>
#include <com/sun/star/awt/WindowAttribute.hpp>
#include <com/sun/star/awt/WindowClass.hpp>
@@ -44,7 +45,7 @@ namespace sd { namespace presenter {
//===== Service ===============================================================
Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new PresenterHelper(rxContext)));
}
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index b8f43be..998cbb1 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -19,6 +19,7 @@
#include "PresenterPreviewCache.hxx"
+#include "facreg.hxx"
#include "cache/SlsCacheContext.hxx"
#include "tools/IdleDetection.hxx"
@@ -77,7 +78,7 @@ private:
//===== Service ===============================================================
Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new PresenterPreviewCache(rxContext)));
}
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index b3cea2b..bc595f1 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -19,6 +19,7 @@
#include "PresenterTextView.hxx"
+#include "facreg.hxx"
#include <i18nlangtag/mslangid.hxx>
#include <cppcanvas/vclfactory.hxx>
@@ -52,7 +53,7 @@ namespace sd { namespace presenter {
// Service
Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new PresenterTextView(rxContext)));
}
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index ff42f71..0526a0d 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -19,6 +19,7 @@
#include "SlideRenderer.hxx"
+#include "facreg.hxx"
#include "sdpage.hxx"
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/rendering/XBitmapCanvas.hpp>
@@ -34,7 +35,7 @@ namespace sd { namespace presenter {
//===== Service ===============================================================
Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new SlideRenderer(rxContext)));
}
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index ba99888..3a022b2 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -201,8 +201,6 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
Transmitter::PRIORITY_LOW );
}
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, const OUString& aUrl );
-
// Code copied from sdremote/source/presenter/PresenterNotesView.cxx
OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
{
@@ -283,119 +281,4 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
aRet.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
}
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, const OUString& aUrl )
-{
- OUString aFilterName( "XHTML Draw File" );
- uno::Reference< document::XExporter > xExporter;
-
- {
- uno::Reference< lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory();
- uno::Reference < lang::XMultiServiceFactory > xFilterFact (
- xMan->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY );
-
- uno::Sequence < beans::PropertyValue > aProps;
- uno::Reference < container::XNameAccess > xFilters ( xFilterFact, uno::UNO_QUERY );
- if ( xFilters->hasByName( aFilterName ) )
- xFilters->getByName( aFilterName ) >>= aProps;
- else
- fprintf( stderr, "Couldn't find by name.\n" );
-
- OUString aFilterImplName;
- sal_Int32 nFilterProps = aProps.getLength();
- for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ )
- {
- const beans::PropertyValue& rFilterProp = aProps[nFilterProp];
- if ( rFilterProp.Name.equalsAscii("FilterService") )
- {
- rFilterProp.Value >>= aFilterImplName;
- break;
- }
- }
-
- fprintf( stderr, "aName%s\n", OUStringToOString(aFilterImplName, RTL_TEXTENCODING_UTF8).getStr() );
- if ( !aFilterImplName.isEmpty() )
- {
- try{
- xExporter = uno::Reference< document::XExporter >
- ( xFilterFact->createInstanceWithArguments( aFilterName, uno::Sequence < uno::Any >() ), uno::UNO_QUERY );
- }catch(const uno::Exception&)
- {
- xExporter.clear();
- fprintf( stderr, "Couldn't create instance of filter.\n" );
- }
- }
- }
-
- if ( xExporter.is() )
- {
- try{
- uno::Reference< lang::XComponent > xComp( aNotesPage, uno::UNO_QUERY_THROW );
- uno::Reference< document::XFilter > xFilter( xExporter, uno::UNO_QUERY_THROW );
- xExporter->setSourceDocument( xComp );
-
- com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOldArgs ( 2 );
- aOldArgs[0].Name = "FileName";
- aOldArgs[0].Value <<= OUString( aUrl );
- aOldArgs[1].Name = "FilterName";
- aOldArgs[1].Value <<= OUString("com.sun.star.documentconversion.XSLTFilter");
-
- SfxMedium rMedium( aUrl , STREAM_STD_WRITE );
-
- const com::sun::star::beans::PropertyValue * pOldValue = aOldArgs.getConstArray();
- com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aArgs ( aOldArgs.getLength() );
- com::sun::star::beans::PropertyValue * pNewValue = aArgs.getArray();
-
-
- // put in the REAL file name, and copy all PropertyValues
- const OUString sOutputStream ( "OutputStream" );
- const OUString sStream ( "StreamForOutput" );
- sal_Bool bHasOutputStream = sal_False;
- sal_Bool bHasStream = sal_False;
- sal_Bool bHasBaseURL = sal_False;
- sal_Int32 i;
- sal_Int32 nEnd = aOldArgs.getLength();
-
- for ( i = 0; i < nEnd; i++ )
- {
- pNewValue[i] = pOldValue[i];
- if ( pOldValue[i].Name == "FileName" )
- pNewValue[i].Value <<= OUString ( rMedium.GetName() );
- else if ( pOldValue[i].Name == sOutputStream )
- bHasOutputStream = sal_True;
- else if ( pOldValue[i].Name == sStream )
- bHasStream = sal_True;
- else if ( pOldValue[i].Name == "DocumentBaseURL" )
- bHasBaseURL = sal_True;
- }
-
- if ( !bHasOutputStream )
- {
- aArgs.realloc ( ++nEnd );
- aArgs[nEnd-1].Name = sOutputStream;
- aArgs[nEnd-1].Value <<= uno::Reference < io::XOutputStream > ( new utl::OOutputStreamWrapper ( *rMedium.GetOutStream() ) );
- }
-
- // add stream as well, for OOX export and maybe others
- if ( !bHasStream )
- {
- aArgs.realloc ( ++nEnd );
- aArgs[nEnd-1].Name = sStream;
- aArgs[nEnd-1].Value <<= com::sun::star::uno::Reference < com::sun::star::io::XStream > ( new utl::OStreamWrapper ( *rMedium.GetOutStream() ) );
- }
-
- if ( !bHasBaseURL )
- {
- aArgs.realloc ( ++nEnd );
- aArgs[nEnd-1].Name = "DocumentBaseURL";
- aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( true );
- }
-
- return xFilter->filter( aArgs );
- }catch(const uno::Exception&)
- {}
- }
-
- return sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
index fcc9ad3..56a425e 100644
--- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx
+++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx
@@ -18,14 +18,10 @@
*/
#include "CustomAnimationPanel.hxx"
+#include "createcustomanimationpanel.hxx"
#include "ViewShellBase.hxx"
-
-namespace sd {
- extern ::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
-}
-
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx
index 386e0f8..6585392 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -67,13 +67,6 @@ public:
*/
void RemoveEventListener (const Link& rEventListener);
- /** Return a set of the names of master pages for the given document.
- This convenience method exists because this set is part of the
- internal data structure and thus takes no time to create.
- */
- inline MasterPageObserver::MasterPageNameSet GetMasterPageNames (
- SdDrawDocument& rDocument);
-
private:
::std::vector<Link> maListeners;
@@ -257,25 +250,6 @@ void MasterPageObserver::Implementation::RemoveEventListener (
rEventListener));
}
-
-
-
-MasterPageObserver::MasterPageNameSet
- MasterPageObserver::Implementation::GetMasterPageNames (
- SdDrawDocument& rDocument)
-{
- MasterPageContainer::iterator aMasterPageDescriptor (
- maUsedMasterPages.find(&rDocument));
- if (aMasterPageDescriptor != maUsedMasterPages.end())
- return aMasterPageDescriptor->second;
- else
- // Not found so return an empty set.
- return MasterPageObserver::MasterPageNameSet();
-}
-
-
-
-
void MasterPageObserver::Implementation::Notify(
SfxBroadcaster& rBroadcaster,
const SfxHint& rHint)
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index a647e89..847ec57 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -18,6 +18,7 @@
*/
#include "PanelFactory.hxx"
+#include "facreg.hxx"
#include "framework/Pane.hxx"
#include "ViewShellBase.hxx"
#include "DrawController.hxx"
@@ -65,7 +66,7 @@ Reference<lang::XEventListener> mxControllerDisposeListener;
// ----- Service functions ----------------------------------------------------
Reference<XInterface> SAL_CALL PanelFactory_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<XWeak*>(new PanelFactory(rxContext)));
}
diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
index 8541d18..30cbe13 100644
--- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx
+++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx
@@ -18,17 +18,10 @@
*/
#include "SlideTransitionPanel.hxx"
+#include "createslidetransitionpanel.hxx"
#include "ViewShellBase.hxx"
-
-namespace sd {
- extern ::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame);
-}
-
-
-
-
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx
index 8379bac..dd9a133 100644
--- a/sd/source/ui/sidebar/TableDesignPanel.cxx
+++ b/sd/source/ui/sidebar/TableDesignPanel.cxx
@@ -18,15 +18,10 @@
*/
#include "TableDesignPanel.hxx"
+#include "createtabledesignpanel.hxx"
#include "ViewShellBase.hxx"
-
-namespace sd {
- extern ::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase);
-}
-
-
namespace sd { namespace sidebar {
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 5eb6754..8c62476 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -42,6 +42,7 @@
#include "framework/FrameworkHelper.hxx"
#include "FrameView.hxx"
+#include "createpresentation.hxx"
#include "unomodel.hxx"
#include "slideshow.hxx"
#include "slideshowimpl.hxx"
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6193b12..86574f8 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -57,6 +57,7 @@
#include <svx/galbrws.hxx>
#include "NavigatorChildWindow.hxx"
#include "AnimationChildWindow.hxx"
+#include "notifydocumentevent.hxx"
#include <slideshowimpl.hxx>
#include <slideshowviewimpl.hxx>
#include <pgjump.hxx>
@@ -94,7 +95,6 @@ using namespace ::com::sun::star::document;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::beans;
-extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName );
extern OUString getUiNameFromPageApiNameImpl( const OUString& rApiName );
namespace sd
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 8e20f19..f0d2309 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -61,8 +61,6 @@ public:
bool HasReplacement (void) const { return (mpReplacement.get() != NULL); }
inline bool HasLosslessReplacement (void) const;
- void Clear (void) { maPreview.SetEmpty(); maMarkedPreview.SetEmpty();
- mpReplacement.reset(); mpCompressor.reset(); }
void Invalidate (void) { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; }
bool IsPrecious (void) const { return mbIsPrecious; }
void SetPrecious (bool bIsPrecious) { mbIsPrecious = bIsPrecious; }
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 74ceb59..58a8c43 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
#include "model/SlideSorterModel.hxx"
#include "model/SlsPageDescriptor.hxx"
@@ -27,7 +30,7 @@ using namespace ::sd::slidesorter::model;
namespace {
class PageEnumerationImpl
- : public Enumeration<SharedPageDescriptor>
+ : public Enumeration<SharedPageDescriptor>, private boost::noncopyable
{
public:
inline PageEnumerationImpl (
@@ -62,9 +65,6 @@ private:
one pointed to by mnIndex.
*/
inline void AdvanceToNextValidElement (void);
-
- // Assignment operator not implemented.
- PageEnumerationImpl& operator= (const PageEnumerationImpl&);
};
} // end of anonymouse namespace
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 93fc714..f94a993 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -19,6 +19,7 @@
#include "SlideSorterService.hxx"
+#include "facreg.hxx"
#include "controller/SlideSorterController.hxx"
#include "controller/SlsProperties.hxx"
#include "controller/SlsCurrentSlideManager.hxx"
@@ -59,7 +60,7 @@ namespace {
//===== Service ===============================================================
Reference<XInterface> SAL_CALL SlideSorterService_createInstance (
- const Reference<XComponentContext>& rxContext)
+ const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
{
return Reference<XInterface>(static_cast<drawing::XDrawView*>(new SlideSorterService(rxContext)));
}
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index e8c925d..4891da2 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -144,7 +144,6 @@ private:
RunContainer maRuns;
InsertPosition maInsertPosition;
- void StopAnimation (void);
SharedPageObjectRun GetRun (
view::Layouter& rLayouter,
const InsertPosition& rInsertPosition,
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 2c3cf5b..48b94ee 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -227,9 +227,6 @@ protected:
class VerticalImplementation : public Layouter::Implementation
{
public:
- VerticalImplementation (
- const SharedSdWindow& rpWindow,
- const ::boost::shared_ptr<view::Theme>& rpTheme);
VerticalImplementation (const Implementation& rImplementation);
virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE;
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 1b73da7..c0211b6 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -46,6 +46,7 @@
#include <svx/sdr/table/tabledesign.hxx>
#include "TableDesignPane.hxx"
+#include "createtabledesignpanel.hxx"
#include "DrawDocShell.hxx"
#include "ViewShellBase.hxx"
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 7af968d..4967342 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -137,6 +137,8 @@ public:
virtual short Execute() SAL_OVERRIDE;
};
+void showTableDesignDialog( ::Window*, ViewShellBase& );
+
}
#endif // _SD_TABLEFORMATPANE_HXX
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 49eb753..55c1479 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -53,8 +53,10 @@
#include <svl/style.hxx>
#include "framework/FrameworkHelper.hxx"
+#include "TableDesignPane.hxx"
#include "app.hrc"
#include "glob.hrc"
+#include "tablefunction.hxx"
#include "DrawViewShell.hxx"
#include "drawdoc.hxx"
#include "DrawDocShell.hxx"
@@ -79,7 +81,6 @@ using namespace ::com::sun::star::linguistic2;
namespace sd
{
-extern void showTableDesignDialog( ::Window*, ViewShellBase& );
static void apply_table_style( SdrTableObj* pObj, SdrModel* pModel, const OUString& sTableStyle )
{
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 8c47f7b..cc9f9d5 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -36,6 +36,8 @@
#include <svx/svxids.hrc>
#include "app.hrc"
+#include "createtableobjectbar.hxx"
+#include "registerinterfaces.hxx"
#include "res_bmp.hrc"
#include "glob.hrc"
#include "strings.hrc"
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index 7026001..2bc55c0 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -38,6 +38,7 @@
#include "drawdoc.hxx"
#include "DrawDocShell.hxx"
+#include "UnoDocumentSettings.hxx"
#include "unomodel.hxx"
#include "optsitem.hxx"
@@ -123,7 +124,7 @@ namespace sd
};
Reference< XInterface > SAL_CALL DocumentSettings_createInstance( SdXImpressDocument* pModel )
- throw( Exception )
+ throw ()
{
DBG_ASSERT( pModel, "I need a model for the DocumentSettings!" );
return (XWeak*)new DocumentSettings( pModel );
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index 9d8253e..e979cf3 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/registry/XRegistryKey.hpp>
+#include "facreg.hxx"
#include "sddll.hxx"
#include <cppuhelper/factory.hxx>
@@ -33,164 +34,6 @@
using namespace com::sun::star;
-
-// Forward declarations of the factories.
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
-extern OUString SdDrawingDocument_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdDrawingDocument_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory, const sal_uInt64 _nCreationFlags );
-extern OUString SdPresentationDocument_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdHtmlOptionsDialog_CreateInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString SdHtmlOptionsDialog_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SdUnoModule_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString SdUnoModule_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( uno::RuntimeException );
-
-namespace sd
-{
-extern uno::Reference< uno::XInterface > SAL_CALL RandomNode_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString RandomNode__getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL SlideLayoutController_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString SlideLayoutController_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( uno::RuntimeException );
-
-extern uno::Reference< uno::XInterface > SAL_CALL InsertSlideController_createInstance( const uno::Reference< lang::XMultiServiceFactory > & _rxFactory );
-extern OUString InsertSlideController_getImplementationName() throw( uno::RuntimeException );
-extern uno::Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( uno::RuntimeException );
-}
-
-namespace sd { namespace framework {
-
-extern uno::Reference<uno::XInterface> SAL_CALL Configuration_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString Configuration_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL ConfigurationController_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString ConfigurationController_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL ModuleController_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString ModuleController_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL BasicPaneFactory_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString BasicPaneFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL BasicToolBarFactory_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString BasicToolBarFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL BasicViewFactory_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString BasicViewFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL ResourceId_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString ResourceId_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresentationFactoryProvider_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString PresentationFactoryProvider_getImplementationName(void)
- throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-} }
-
-namespace sd { namespace sidebar {
-
-extern uno::Reference<uno::XInterface> SAL_CALL PanelFactory_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString PanelFactory_getImplementationName(void) throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-} }
-
-namespace sd { namespace presenter {
-extern uno::Reference<uno::XInterface> SAL_CALL SlideRenderer_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString SlideRenderer_getImplementationName(void)
- throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterCanvas_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString PresenterCanvas_getImplementationName(void)
- throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterTextViewService_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString PresenterTextViewService_getImplementationName(void)
- throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterHelperService_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString PresenterHelperService_getImplementationName(void)
- throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-
-extern uno::Reference<uno::XInterface> SAL_CALL PresenterPreviewCache_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString PresenterPreviewCache_getImplementationName(void)
- throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-} }
-
-
-namespace sd { namespace slidesorter {
-extern uno::Reference<uno::XInterface> SAL_CALL SlideSorterService_createInstance(
- const uno::Reference<uno::XComponentContext>& rxContext)
- throw(uno::Exception);
-extern OUString SlideSorterService_getImplementationName(void)
- throw (uno::RuntimeException);
-extern uno::Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void)
- throw (uno::RuntimeException);
-} }
-
using namespace ::sd;
using namespace ::sd::framework;
using namespace ::sd::presenter;
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 5ce5b53..830694f 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -34,6 +34,8 @@
#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
#include "CustomAnimationPreset.hxx"
+#include "facreg.hxx"
+#include "randomnode.hxx"
using ::osl::Mutex;
using ::osl::Guard;
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 6f4db92..dd813c5 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -26,6 +26,7 @@
#include <comphelper/extract.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include "createunocustomshow.hxx"
#include "unohelp.hxx"
#include "unomodel.hxx"
#include "drawdoc.hxx"
diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx
index c33dd80..e6ff309 100644
--- a/sd/source/ui/unoidl/unodoc.cxx
+++ b/sd/source/ui/unoidl/unodoc.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "sddll.hxx"
+#include "facreg.hxx"
#include "DrawDocShell.hxx"
#include "GraphicDocShell.hxx"
#include <osl/mutex.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 7dd272f..aa91133 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -35,7 +35,9 @@
#include <cppuhelper/supportsservice.hxx>
#include <editeng/unofield.hxx>
+#include <notifydocumentevent.hxx>
#include <unomodel.hxx>
+#include <unopool.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/bindings.hxx>
#include <vcl/svapp.hxx>
@@ -109,8 +111,6 @@ using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
-extern uno::Reference< uno::XInterface > SdUnoCreatePool( SdDrawDocument* pDrawModel );
-
class SdUnoForbiddenCharsTable : public SvxUnoForbiddenCharsTable,
public SfxListener
{
@@ -768,8 +768,6 @@ uno::Reference< container::XNameContainer > SAL_CALL SdXImpressDocument::getCust
return xCustomPres;
}
-extern uno::Reference< presentation::XPresentation > createPresentation( SdXImpressDocument& rModel );
-
// XPresentationSupplier
uno::Reference< presentation::XPresentation > SAL_CALL SdXImpressDocument::getPresentation()
throw(uno::RuntimeException, std::exception)
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index 78438197..ca507c2 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/frame/DispatchResultState.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include "facreg.hxx"
#include "sddll.hxx"
#include "sdmod.hxx"
#include "unomodule.hxx"
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 476332f..eac1f29 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -290,8 +290,6 @@ struct SortStruct
typedef SortStruct SORT;
typedef SORT* PSORT;
-extern "C" int SAL_CALL SortFunc( const void* p1, const void* p2 );
-
SdXShape::SdXShape( SvxShape* pShape, SdXImpressDocument* pModel) throw()
: mpShape( pShape ),
mpPropSet( pModel?
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 4c04ab3..75ed1d3 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -35,6 +35,8 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <AnnotationEnumeration.hxx>
+#include <createunopageimpl.hxx>
#include <unomodel.hxx>
#include <unopage.hxx>
#include <svx/svxids.hrc>
@@ -81,11 +83,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::office;
-namespace sd {
-extern Reference< XAnnotation > createAnnotation( const Reference< XComponentContext >& xContext, SdPage* );
-extern Reference< XAnnotationEnumeration > createAnnotationEnumeration( const sd::AnnotationVector& );
-}
-
// this are the ids for page properties
enum WID_PAGE
{
diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx
index 8914bc0..857874b 100644
--- a/sd/source/ui/unoidl/unopool.cxx
+++ b/sd/source/ui/unoidl/unopool.cxx
@@ -23,6 +23,7 @@
#include <svx/unopool.hxx>
#include "drawdoc.hxx"
+#include "unopool.hxx"
using namespace ::com::sun::star;
using namespace ::rtl;
diff --git a/sd/source/ui/unoidl/unopool.hxx b/sd/source/ui/unoidl/unopool.hxx
new file mode 100644
index 0000000..db7e009
--- /dev/null
+++ b/sd/source/ui/unoidl/unopool.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPOOL_HXX
+#define INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPOOL_HXX
+
+#include <sal/config.h>
+
+css::uno::Reference<css::uno::XInterface> SdUnoCreatePool(
+ SdDrawDocument * pDrawModel);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index dba0ca8..3be7dd0 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -204,8 +204,6 @@ private:
SfxShell* mpTopShell;
- void GatherActiveShells (ShellStack& rShellList);
-
void UpdateShellStack (void);
void CreateShells (void);
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 56970bf..d93f583 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -79,23 +79,6 @@ private:
} // end of anonymous namespace
-
-
-
-
-class ViewTabPage : public TabPage
-{
-public:
- ViewTabPage (Window* pParent) : TabPage(pParent) {}
- virtual void Resize (void) SAL_OVERRIDE
- { SetPosSizePixel(Point(0,0),GetParent()->GetOutputSizePixel()); }
-};
-
-
-
-
-//===== ViewTabBar ============================================================
-
ViewTabBar::ViewTabBar (
const Reference<XResourceId>& rxViewTabBarId,
const Reference<frame::XController>& rxController)
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index f317d91..f588d9f 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -55,6 +55,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include "DrawDocShell.hxx"
#include "fupoor.hxx"
+#include "tablefunction.hxx"
#include "Window.hxx"
#include "sdxfer.hxx"
#include "sdpage.hxx"
@@ -1490,8 +1491,6 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
return bReturn;
}
-extern void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel );
-
bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions )
{
SdDrawDocument* pModel = new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh );
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 0afec03..9d32cfd 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -187,10 +187,6 @@ void ImageButtonHdl::HideTip()
}
}
-
-
-extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL );
-
void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt)
{
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index f87d917..ca89e24 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -20,6 +20,7 @@
#include "ViewShell.hxx"
#include "ViewShellImplementation.hxx"
+#include "createtableobjectbar.hxx"
#include <com/sun/star/embed/EmbedStates.hpp>
#include "ViewShellBase.hxx"
@@ -81,10 +82,6 @@
#include <glob.hrc>
#include "AccessibleDocumentViewBase.hxx"
-namespace sd { namespace ui { namespace table {
- extern SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView );
-} } }
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
More information about the Libreoffice-commits
mailing list