This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 1a03dc2c48 Cleanup
1a03dc2c48 is described below
commit 1a03dc2c489554774abaf88ae3ad43d8cca28144
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Apr 8 11:47:45 2025 +0200
Cleanup
(cherry picked from commit 6c3f46008062a6f976c36b489e4ef55c817e828c)
---
.../inc/drawinglayer/attribute/lineattribute.hxx | 35 ++--
.../source/ui/animations/CustomAnimationList.hxx | 20 +--
.../source/ui/inc/AccessibleOutlineEditSource.hxx | 112 ++++++------
main/sd/source/ui/inc/AccessibleOutlineView.hxx | 161 +++++++++--------
.../ui/inc/AccessiblePresentationGraphicShape.hxx | 51 +++---
.../ui/inc/AccessiblePresentationOLEShape.hxx | 49 +++--
.../source/ui/inc/AccessiblePresentationShape.hxx | 64 +++----
main/sd/source/ui/inc/AccessibleScrollPanel.hxx | 61 ++++---
main/sd/source/ui/inc/MasterPageObserver.hxx | 148 ++++++++-------
main/sd/source/ui/inc/WindowUpdater.hxx | 199 ++++++++++-----------
main/sd/source/ui/inc/slideshow.hxx | 76 ++++----
main/sd/source/ui/inc/taskpane/TitleBar.hxx | 21 ++-
main/sd/source/ui/inc/taskpane/TitledControl.hxx | 16 +-
.../source/ui/sidebar/RecentlyUsedMasterPages.hxx | 25 ++-
main/sd/source/ui/sidebar/SidebarShellManager.hxx | 140 +++++++--------
.../slidesorter/controller/SlsSelectionCommand.hxx | 81 +++++----
.../slidesorter/inc/controller/SlsSlotManager.hxx | 95 +++++-----
17 files changed, 666 insertions(+), 688 deletions(-)
diff --git a/main/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
b/main/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
index d0f34924f4..6c6be8e81e 100644
--- a/main/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
+++ b/main/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX
#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX
@@ -28,57 +26,52 @@
#include <basegfx/vector/b2enums.hxx>
#include <com/sun/star/drawing/LineCap.hpp>
-//////////////////////////////////////////////////////////////////////////////
// predefines
namespace basegfx {
- class BColor;
+ class BColor;
}
namespace drawinglayer { namespace attribute {
class ImpLineAttribute;
}}
-//////////////////////////////////////////////////////////////////////////////
-
namespace drawinglayer
{
namespace attribute
{
class DRAWINGLAYER_DLLPUBLIC LineAttribute
{
- private:
- ImpLineAttribute* mpLineAttribute;
+ private:
+ ImpLineAttribute*
mpLineAttribute;
public:
- /// constructors/assignmentoperator/destructor
+ // constructors/assignmentoperator/destructor
LineAttribute(
const basegfx::BColor& rColor,
double fWidth = 0.0,
basegfx::B2DLineJoin aB2DLineJoin =
basegfx::B2DLINEJOIN_ROUND,
- com::sun::star::drawing::LineCap aLineCap =
com::sun::star::drawing::LineCap_BUTT);
+ com::sun::star::drawing::LineCap aLineCap =
com::sun::star::drawing::LineCap_BUTT);
LineAttribute();
LineAttribute(const LineAttribute& rCandidate);
LineAttribute& operator=(const LineAttribute&
rCandidate);
~LineAttribute();
- // checks if the incarnation is default constructed
- bool isDefault() const;
+ // checks if the incarnation is default constructed
+ bool isDefault() const;
- // compare operator
+ // compare operator
bool operator==(const LineAttribute& rCandidate) const;
// data read access
const basegfx::BColor& getColor() const;
double getWidth() const;
basegfx::B2DLineJoin getLineJoin() const;
- com::sun::star::drawing::LineCap getLineCap() const;
+ com::sun::star::drawing::LineCap getLineCap() const;
};
} // end of namespace attribute
} // end of namespace drawinglayer
-//////////////////////////////////////////////////////////////////////////////
-
#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/animations/CustomAnimationList.hxx
b/main/sd/source/ui/animations/CustomAnimationList.hxx
index c9c34a97ca..a29c1d3595 100644
--- a/main/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/main/sd/source/ui/animations/CustomAnimationList.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _SD_CUSTOMANIMATIONLIST_HXX
#define _SD_CUSTOMANIMATIONLIST_HXX
@@ -81,13 +79,13 @@ public:
virtual void SelectHdl();
virtual sal_Bool DoubleClickHdl();
- virtual void Paint( const Rectangle& rRect );
+ virtual void Paint( const Rectangle& rRect );
virtual PopupMenu* CreateContextMenu( void );
virtual void ExcecuteContextMenuAction( sal_uInt16
nSelectedPopupEntry );
-
+
virtual void KeyInput( const KeyEvent& rKEvt );
-
+
// virtual SvLBoxEntry* CreateEntry() const;
virtual void SetTabs();
@@ -97,7 +95,7 @@ public:
bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const;
- /// clears all entries from the listbox
+ // clears all entries from the listbox
void clear();
private:
@@ -123,3 +121,5 @@ private:
}
#endif // _SD_CUSTOMANIMATIONLIST_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
b/main/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index 2f0e47622c..a9935954d8 100644
--- a/main/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/main/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_EDITSOURCE_HXX
#define SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_EDITSOURCE_HXX
@@ -38,63 +36,65 @@ class SdrOutliner;
class SdrView;
class Window;
-namespace accessibility
+namespace accessibility
{
/** Implementation of the SvxEditSource interface in the
SdOutlineView
-
+
This class connects the SdOutlineView and its EditEngine
outliner with the AccessibleTextHelper, which provides all
necessary functionality to make the outliner text accessible
- @see SvxEditSource
- @see SvxViewForwarder
- */
- class AccessibleOutlineEditSource : public SvxEditSource, public
SvxViewForwarder, public SfxBroadcaster, public SfxListener
- {
- public:
- /// Create an SvxEditSource interface for the given Outliner
- AccessibleOutlineEditSource(
- SdrOutliner& rOutliner,
- SdrView& rView,
- OutlinerView& rOutlView,
- const ::Window& rViewWindow );
- virtual ~AccessibleOutlineEditSource();
-
- /// This method is disabled and always returns NULL
- virtual SvxEditSource* Clone() const;
- virtual SvxTextForwarder* GetTextForwarder();
- virtual SvxViewForwarder* GetViewForwarder();
- virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool
bCreate = sal_False );
- virtual void UpdateData();
- virtual SfxBroadcaster& GetBroadcaster() const;
-
- // the view forwarder
- virtual sal_Bool IsValid() const;
- virtual Rectangle GetVisArea() const;
- virtual Point LogicToPixel( const Point& rPoint, const
MapMode& rMapMode ) const;
- virtual Point PixelToLogic( const Point& rPoint, const
MapMode& rMapMode ) const;
-
- // SfxListener
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint&
rHint );
-
- private:
-
- // declared, but not defined
- AccessibleOutlineEditSource( const AccessibleOutlineEditSource& );
- AccessibleOutlineEditSource& operator=( const
AccessibleOutlineEditSource& );
-
- DECL_LINK( NotifyHdl, EENotify* );
-
- SdrView& mrView;
- const ::Window& mrWindow;
- SdrOutliner* mpOutliner;
- OutlinerView* mpOutlinerView;
-
- SvxOutlinerForwarder mTextForwarder;
- SvxDrawOutlinerViewForwarder mViewForwarder;
-
- };
+ @see SvxEditSource
+ @see SvxViewForwarder
+ */
+ class AccessibleOutlineEditSource : public SvxEditSource, public
SvxViewForwarder, public SfxBroadcaster, public SfxListener
+ {
+ public:
+ // Create an SvxEditSource interface for the given Outliner
+ AccessibleOutlineEditSource(
+ SdrOutliner& rOutliner,
+ SdrView& rView,
+ OutlinerView& rOutlView,
+ const ::Window& rViewWindow );
+ virtual ~AccessibleOutlineEditSource();
+
+ // This method is disabled and always returns NULL
+ virtual SvxEditSource* Clone() const;
+ virtual SvxTextForwarder* GetTextForwarder();
+ virtual SvxViewForwarder* GetViewForwarder();
+ virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool
bCreate = sal_False );
+ virtual void UpdateData();
+ virtual SfxBroadcaster& GetBroadcaster() const;
+
+ // the view forwarder
+ virtual sal_Bool IsValid() const;
+ virtual Rectangle GetVisArea() const;
+ virtual Point LogicToPixel( const Point& rPoint,
const MapMode& rMapMode ) const;
+ virtual Point PixelToLogic( const Point& rPoint,
const MapMode& rMapMode ) const;
+
+ // SfxListener
+ virtual void Notify( SfxBroadcaster& rBC, const
SfxHint& rHint );
+
+ private:
+
+ // declared, but not defined
+ AccessibleOutlineEditSource( const AccessibleOutlineEditSource&
);
+ AccessibleOutlineEditSource& operator=( const
AccessibleOutlineEditSource& );
+
+ DECL_LINK( NotifyHdl, EENotify* );
+
+ SdrView& mrView;
+ const ::Window& mrWindow;
+ SdrOutliner* mpOutliner;
+ OutlinerView* mpOutlinerView;
+
+ SvxOutlinerForwarder mTextForwarder;
+ SvxDrawOutlinerViewForwarder mViewForwarder;
+
+ };
} // end of namespace accessibility
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/AccessibleOutlineView.hxx
b/main/sd/source/ui/inc/AccessibleOutlineView.hxx
index ac5ded2071..eaed8ced3e 100644
--- a/main/sd/source/ui/inc/AccessibleOutlineView.hxx
+++ b/main/sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_VIEW_HXX
#define SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_VIEW_HXX
@@ -34,126 +32,127 @@ class Window;
namespace accessibility {
-
/** This class makes the Impress outline view accessible.
- Please see the documentation of the base class for further
- explanations of the individual methods. This class is a mere
- wrapper around the AccessibleTextHelper class; as basically the
- Outline View is a big Outliner.
-*/
+ Please see the documentation of the base class for further
+ explanations of the individual methods. This class is a mere
+ wrapper around the AccessibleTextHelper class; as basically the
+ Outline View is a big Outliner.
+ */
class AccessibleOutlineView
- : public AccessibleDocumentViewBase
+ : public AccessibleDocumentViewBase
{
public:
- AccessibleOutlineView (
- ::sd::Window* pSdWindow,
- ::sd::OutlineViewShell* pViewShell,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XController>& rxController,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>& rxParent);
+ AccessibleOutlineView (
+ ::sd::Window* pSdWindow,
+ ::sd::OutlineViewShell* pViewShell,
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::frame::XController>& rxController,
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::accessibility::XAccessible>& rxParent);
- virtual ~AccessibleOutlineView (void);
+ virtual ~AccessibleOutlineView (void);
- /** Complete the initialization begun in the constructor.
- */
- virtual void Init (void);
+ /** Complete the initialization begun in the constructor.
+ */
+ virtual void Init (void);
- //===== IAccessibleViewForwarderListener ================================
+ // ===== IAccessibleViewForwarderListener
================================
- virtual void ViewForwarderChanged (ChangeType aChangeType,
- const IAccessibleViewForwarder* pViewForwarder);
+ virtual void ViewForwarderChanged (ChangeType aChangeType,
+ const IAccessibleViewForwarder* pViewForwarder);
- //===== XAccessibleContext ==============================================
+ // ===== XAccessibleContext
==============================================
- virtual sal_Int32 SAL_CALL
- getAccessibleChildCount (void)
- throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL
+ getAccessibleChildCount (void)
+ throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> SAL_CALL
- getAccessibleChild (sal_Int32 nIndex)
- throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
- getAccessibleName(void)
- throw (::com::sun::star::uno::RuntimeException);
- //===== XAccessibleEventBroadcaster
========================================
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> SAL_CALL
+ getAccessibleChild (sal_Int32 nIndex)
+ throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL
+ getAccessibleName(void)
+ throw (::com::sun::star::uno::RuntimeException);
+ // ===== XAccessibleEventBroadcaster
========================================
- virtual void SAL_CALL
- addEventListener (
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener >&
xListener)
- throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL
+ addEventListener (
+ const ::com::sun::star::uno::Reference<
+
::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
+ throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL
- removeEventListener (
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleEventListener >&
xListener)
- throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL
+ removeEventListener (
+ const ::com::sun::star::uno::Reference<
+
::com::sun::star::accessibility::XAccessibleEventListener >& xListener)
+ throw (::com::sun::star::uno::RuntimeException);
using cppu::WeakComponentImplHelperBase::addEventListener;
using cppu::WeakComponentImplHelperBase::removeEventListener;
- //===== XServiceInfo ====================================================
-
- /** Returns an identifier for the implementation of this object.
- */
+ // ===== XServiceInfo
====================================================
+
+ /** Returns an identifier for the implementation of this object.
+ */
virtual ::rtl::OUString SAL_CALL
- getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException);
+ getImplementationName (void)
+ throw (::com::sun::star::uno::RuntimeException);
- //===== lang::XEventListener ============================================
+ // ===== lang::XEventListener
============================================
virtual void SAL_CALL
disposing (const ::com::sun::star::lang::EventObject&
rEventObject)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException);
- //===== XPropertyChangeListener =========================================
+ // ===== XPropertyChangeListener
=========================================
virtual void SAL_CALL
propertyChange (const
::com::sun::star::beans::PropertyChangeEvent& rEventObject)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException);
protected:
- // overridden, as we hold the listeners ourselves
- virtual void FireEvent (const
::com::sun::star::accessibility::AccessibleEventObject& aEvent);
+ // overridden, as we hold the listeners ourselves
+ virtual void FireEvent (const
::com::sun::star::accessibility::AccessibleEventObject& aEvent);
- // overridden to detect focus changes
- virtual void Activated (void);
+ // overridden to detect focus changes
+ virtual void Activated (void);
- // overridden to detect focus changes
- virtual void Deactivated (void);
+ // overridden to detect focus changes
+ virtual void Deactivated (void);
- // declared, but not defined
- AccessibleOutlineView( const AccessibleOutlineView& );
- AccessibleOutlineView& operator= ( const AccessibleOutlineView& );
+ // declared, but not defined
+ AccessibleOutlineView( const AccessibleOutlineView& );
+ AccessibleOutlineView& operator= ( const AccessibleOutlineView& );
- // This method is called from the component helper base class while
disposing.
- virtual void SAL_CALL disposing (void);
+ // This method is called from the component helper base class while
disposing.
+ virtual void SAL_CALL disposing (void);
- /// Create an accessible name that contains the current view mode.
- virtual ::rtl::OUString
- CreateAccessibleName ()
- throw (::com::sun::star::uno::RuntimeException);
+ // Create an accessible name that contains the current view mode.
+ virtual ::rtl::OUString
+ CreateAccessibleName ()
+ throw (::com::sun::star::uno::RuntimeException);
- /// Create an accessible description that contains the current
- /// view mode.
- virtual ::rtl::OUString
- CreateAccessibleDescription ()
- throw (::com::sun::star::uno::RuntimeException);
+ // Create an accessible description that contains the current
+ // view mode.
+ virtual ::rtl::OUString
+ CreateAccessibleDescription ()
+ throw (::com::sun::star::uno::RuntimeException);
private:
- /// Invalidate text helper, updates visible children
- void UpdateChildren();
+ // Invalidate text helper, updates visible children
+ void UpdateChildren();
- AccessibleTextHelper maTextHelper;
+ AccessibleTextHelper maTextHelper;
};
} // end of namespace accessibility
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
b/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
index 81cf2953a9..abe6521179 100644
--- a/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
+++ b/main/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,21 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
-
#ifndef _SD_ACCESSIBILITY_ACCESSIBLE_PRESENTATION_GRAPHIC_SHAPE_HXX
#define _SD_ACCESSIBILITY_ACCESSIBLE_PRESENTATION_GRAPHIC_SHAPE_HXX
@@ -31,40 +28,42 @@
namespace accessibility {
/** This class makes Impress shapes accessible.
-*/
+ */
class AccessiblePresentationGraphicShape
- : public AccessibleGraphicShape
+ : public AccessibleGraphicShape
{
public:
- //===== internal
========================================================
+ // ===== internal
========================================================
AccessiblePresentationGraphicShape (
- const AccessibleShapeInfo& rShapeInfo,
- const AccessibleShapeTreeInfo& rShapeTreeInfo);
+ const AccessibleShapeInfo& rShapeInfo,
+ const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessiblePresentationGraphicShape (void);
- //===== XServiceInfo
====================================================
-
- /** Returns an identifier for the implementation of this object.
- */
+ // ===== XServiceInfo
====================================================
+
+ /** Returns an identifier for the implementation of this object.
+ */
virtual ::rtl::OUString SAL_CALL
- getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException);
+ getImplementationName (void)
+ throw (::com::sun::star::uno::RuntimeException);
- //===== internal ========================================================
+ // ===== internal
========================================================
- /// Create a name string that contains the accessible name.
+ // Create a name string that contains the accessible name.
virtual ::rtl::OUString
- CreateAccessibleBaseName ()
- throw (::com::sun::star::uno::RuntimeException);
+ CreateAccessibleBaseName ()
+ throw (::com::sun::star::uno::RuntimeException);
- /// Create a description string that contains the accessible
description.
+ // Create a description string that contains the accessible
description.
virtual ::rtl::OUString
- CreateAccessibleDescription ()
- throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's role.
+ CreateAccessibleDescription ()
+ throw (::com::sun::star::uno::RuntimeException);
+ // Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole () throw
(::com::sun::star::uno::RuntimeException);
};
} // end of namespace accessibility
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
b/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
index be58468d9d..a3288d4e60 100644
--- a/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
+++ b/main/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,21 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
-
#ifndef _SD_ACCESSIBILITY_ACCESSIBLE_PRESENTATION_OLE_SHAPE_HXX
#define _SD_ACCESSIBILITY_ACCESSIBLE_PRESENTATION_OLE_SHAPE_HXX
@@ -33,38 +30,40 @@ namespace accessibility {
/** This class makes Impress shapes accessible.
*/
class AccessiblePresentationOLEShape
- : public AccessibleOLEShape
+ : public AccessibleOLEShape
{
public:
- //===== internal
========================================================
+ // ===== internal
========================================================
AccessiblePresentationOLEShape (
- const AccessibleShapeInfo& rShapeInfo,
- const AccessibleShapeTreeInfo& rShapeTreeInfo);
+ const AccessibleShapeInfo& rShapeInfo,
+ const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessiblePresentationOLEShape (void);
- //===== XServiceInfo
====================================================
-
- /** Returns an identifier for the implementation of this object.
- */
+ // ===== XServiceInfo
====================================================
+
+ /** Returns an identifier for the implementation of this object.
+ */
virtual ::rtl::OUString SAL_CALL
- getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException);
+ getImplementationName (void)
+ throw (::com::sun::star::uno::RuntimeException);
- //===== internal ========================================================
+ // ===== internal
========================================================
- /// Create a name string that contains the accessible name.
+ // Create a name string that contains the accessible name.
virtual ::rtl::OUString
- CreateAccessibleBaseName ()
- throw (::com::sun::star::uno::RuntimeException);
+ CreateAccessibleBaseName ()
+ throw (::com::sun::star::uno::RuntimeException);
- /// Create a description string that contains the accessible
description.
+ // Create a description string that contains the accessible
description.
virtual ::rtl::OUString
- CreateAccessibleDescription ()
- throw (::com::sun::star::uno::RuntimeException);
- /// Return this object's role.
+ CreateAccessibleDescription ()
+ throw (::com::sun::star::uno::RuntimeException);
+ // Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole () throw
(::com::sun::star::uno::RuntimeException);
};
} // end of namespace accessibility
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/AccessiblePresentationShape.hxx
b/main/sd/source/ui/inc/AccessiblePresentationShape.hxx
index 449ad22af1..dcd4ec5f7a 100644
--- a/main/sd/source/ui/inc/AccessiblePresentationShape.hxx
+++ b/main/sd/source/ui/inc/AccessiblePresentationShape.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _SD_ACCESSIBILITY_ACCESSIBLE_PRESENTATION_SHAPE_HXX
#define _SD_ACCESSIBILITY_ACCESSIBLE_PRESENTATION_SHAPE_HXX
@@ -29,51 +27,53 @@
namespace accessibility {
/** This class makes Impress shapes accessible.
-*/
+ */
class AccessiblePresentationShape
- : public AccessibleShape
+ : public AccessibleShape
{
public:
- //===== internal
========================================================
+ // ===== internal
========================================================
AccessiblePresentationShape (
- const AccessibleShapeInfo& rShapeInfo,
- const AccessibleShapeTreeInfo& rShapeTreeInfo);
+ const AccessibleShapeInfo& rShapeInfo,
+ const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessiblePresentationShape (void);
- //===== XServiceInfo
====================================================
-
- /** Returns an identifier for the implementation of this object.
- */
+ // ===== XServiceInfo
====================================================
+
+ /** Returns an identifier for the implementation of this object.
+ */
virtual ::rtl::OUString SAL_CALL
- getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException);
+ getImplementationName (void)
+ throw (::com::sun::star::uno::RuntimeException);
- //===== internal ========================================================
+ // ===== internal
========================================================
- /// Create a name string that contains the accessible name.
+ // Create a name string that contains the accessible name.
virtual ::rtl::OUString
- CreateAccessibleBaseName ()
- throw (::com::sun::star::uno::RuntimeException);
+ CreateAccessibleBaseName ()
+ throw (::com::sun::star::uno::RuntimeException);
- /// Create a description string that contains the accessible
description.
+ // Create a description string that contains the accessible description.
virtual ::rtl::OUString
- CreateAccessibleDescription ()
- throw (::com::sun::star::uno::RuntimeException);
+ CreateAccessibleDescription ()
+ throw (::com::sun::star::uno::RuntimeException);
::rtl::OUString GetStyle();
private:
- /** Don't use the default constructor. Use the public constructor that
- takes the original shape and the parent as arguments instead.
- */
- AccessiblePresentationShape (void);
+ /** Don't use the default constructor. Use the public constructor that
+ takes the original shape and the parent as arguments instead.
+ */
+ AccessiblePresentationShape (void);
- /// Don't use the constructor. Not yet implemented.
- AccessiblePresentationShape (const AccessiblePresentationShape&);
+ // Don't use the constructor. Not yet implemented.
+ AccessiblePresentationShape (const AccessiblePresentationShape&);
- /// Don't use the assignment operator. Not yet implemented.
- AccessiblePresentationShape& operator= (const
AccessiblePresentationShape&);
+ // Don't use the assignment operator. Not yet implemented.
+ AccessiblePresentationShape& operator= (const
AccessiblePresentationShape&);
};
} // end of namespace accessibility
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/AccessibleScrollPanel.hxx
b/main/sd/source/ui/inc/AccessibleScrollPanel.hxx
index 43bcd88018..80306a824a 100644
--- a/main/sd/source/ui/inc/AccessibleScrollPanel.hxx
+++ b/main/sd/source/ui/inc/AccessibleScrollPanel.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef SD_ACCESSIBILITY_ACCESSIBLE_SCROLL_PANEL_HXX
#define SD_ACCESSIBILITY_ACCESSIBLE_SCROLL_PANEL_HXX
@@ -30,47 +28,48 @@ namespace sd { namespace toolpanel {
class ScrollPanel;
} }
-
namespace accessibility {
/** This derived class handles the accessible children different from its
- base class. It adds the scroll bars as children when they are visible.
-*/
+ base class. It adds the scroll bars as children when they are visible.
+ */
class AccessibleScrollPanel
- : public AccessibleTreeNode
+ : public AccessibleTreeNode
{
public:
- AccessibleScrollPanel (
- ::sd::toolpanel::ScrollPanel& rScrollPanel,
- const ::rtl::OUString& rsName,
- const ::rtl::OUString& rsDescription);
- ~AccessibleScrollPanel (void);
+ AccessibleScrollPanel (
+ ::sd::toolpanel::ScrollPanel& rScrollPanel,
+ const ::rtl::OUString& rsName,
+ const ::rtl::OUString& rsDescription);
+ ~AccessibleScrollPanel (void);
- //===== XAccessibleContext
==============================================
+ // ===== XAccessibleContext
==============================================
- /// Return the number of currently visible children.
- virtual sal_Int32 SAL_CALL
- getAccessibleChildCount (void) throw
(::com::sun::star::uno::RuntimeException);
+ // Return the number of currently visible children.
+ virtual sal_Int32 SAL_CALL
+ getAccessibleChildCount (void) throw
(::com::sun::star::uno::RuntimeException);
- /// Return the specified child or throw exception.
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible> SAL_CALL
- getAccessibleChild (sal_Int32 nIndex)
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException);
+ // Return the specified child or throw exception.
+ virtual ::com::sun::star::uno::Reference<
+ ::com::sun::star::accessibility::XAccessible> SAL_CALL
+ getAccessibleChild (sal_Int32 nIndex)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
+ ::com::sun::star::uno::RuntimeException);
- //===== XServiceInfo
====================================================
+ // ===== XServiceInfo
====================================================
- /** Returns an identifier for the implementation of this object.
- */
+ /** Returns an identifier for the implementation of this object.
+ */
virtual ::rtl::OUString SAL_CALL
- getImplementationName (void)
- throw (::com::sun::star::uno::RuntimeException);
+ getImplementationName (void)
+ throw (::com::sun::star::uno::RuntimeException);
private:
- ::sd::toolpanel::ScrollPanel& GetScrollPanel (void) const;
+ ::sd::toolpanel::ScrollPanel& GetScrollPanel (void) const;
};
} // end of namespace accessibility
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/MasterPageObserver.hxx
b/main/sd/source/ui/inc/MasterPageObserver.hxx
index cd61ba8f0b..77727a33b1 100644
--- a/main/sd/source/ui/inc/MasterPageObserver.hxx
+++ b/main/sd/source/ui/inc/MasterPageObserver.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef SD_VIEW_MASTER_PAGE_OBSERVER_HXX
#define SD_VIEW_MASTER_PAGE_OBSERVER_HXX
@@ -36,95 +34,95 @@ class String;
namespace sd {
/** This singleton observes all registered documents for changes in the used
- master pages and in turn informs its listeners about it. One such
- listener is the master page selector control in the tool panel that
- shows the recently used master pages.
-*/
+ master pages and in turn informs its listeners about it. One such
+ listener is the master page selector control in the tool panel that
+ shows the recently used master pages.
+ */
class MasterPageObserver
- : public SdGlobalResource
+ : public SdGlobalResource
{
public:
- typedef ::std::set<String> MasterPageNameSet;
-
- /** Return the single instance of this class.
- */
- static MasterPageObserver& Instance (void);
-
- /** The master page observer will listen to events of this document and
- detect changes of the use of master pages.
- */
- void RegisterDocument (SdDrawDocument& rDocument);
-
- /** The master page observer will stop to listen to events of this
- document.
- */
- void UnregisterDocument (SdDrawDocument& rDocument);
-
- /** Add a listener that is informed of master pages that are newly
- assigned to slides or become unassigned.
- @param rEventListener
- The event listener to call for future events. Call
- RemoveEventListener() before the listener is destroyed.
- */
- void AddEventListener (const Link& rEventListener);
-
- /** Remove the given listener from the list of listeners.
- @param rEventListener
- After this method returns the given listener is not called back
- from this object. Passing a listener that has not
- been registered before is safe and is silently ignored.
- */
- void RemoveEventListener (const Link& rEventListener);
+ typedef ::std::set<String> MasterPageNameSet;
+
+ /** Return the single instance of this class.
+ */
+ static MasterPageObserver& Instance (void);
+
+ /** The master page observer will listen to events of this document and
+ detect changes of the use of master pages.
+ */
+ void RegisterDocument (SdDrawDocument& rDocument);
+
+ /** The master page observer will stop to listen to events of this
+ document.
+ */
+ void UnregisterDocument (SdDrawDocument& rDocument);
+
+ /** Add a listener that is informed of master pages that are newly
+ assigned to slides or become unassigned.
+ @param rEventListener
+ The event listener to call for future events. Call
+ RemoveEventListener() before the listener is destroyed.
+ */
+ void AddEventListener (const Link& rEventListener);
+
+ /** Remove the given listener from the list of listeners.
+ @param rEventListener
+ After this method returns the given listener is not
called back
+ from this object. Passing a listener that has not
+ been registered before is safe and is silently ignored.
+ */
+ void RemoveEventListener (const Link& rEventListener);
private:
static ::osl::Mutex maMutex;
- class Implementation;
- ::std::auto_ptr<Implementation> mpImpl;
+ class Implementation;
+ ::std::auto_ptr<Implementation> mpImpl;
- MasterPageObserver (void);
- virtual ~MasterPageObserver (void);
+ MasterPageObserver (void);
+ virtual ~MasterPageObserver (void);
- /// The copy constructor is not implemented. Do not use!
- MasterPageObserver (const MasterPageObserver&);
+ // The copy constructor is not implemented. Do not use!
+ MasterPageObserver (const MasterPageObserver&);
- /// The assignment operator is not implemented. Do not use!
- MasterPageObserver& operator= (const MasterPageObserver&);
+ // The assignment operator is not implemented. Do not use!
+ MasterPageObserver& operator= (const MasterPageObserver&);
};
-
-
/** Objects of this class are sent to listeners of the MasterPageObserver
- singleton when the list of master pages of one document has changed.
-*/
+ singleton when the list of master pages of one document has changed.
+ */
class MasterPageObserverEvent
{
public:
- enum EventType {
- /// Master page already exists when document is registered.
- ET_MASTER_PAGE_EXISTS,
- /// Master page has been added to a document.
- ET_MASTER_PAGE_ADDED,
- /// Master page has been removed from to a document.
- ET_MASTER_PAGE_REMOVED
- };
-
- EventType meType;
- SdDrawDocument& mrDocument;
- const String& mrMasterPageName;
-
- MasterPageObserverEvent (
- EventType eType,
- SdDrawDocument& rDocument,
- const String& rMasterPageName)
- : meType(eType),
- mrDocument(rDocument),
- mrMasterPageName(rMasterPageName)
- {}
+ enum EventType {
+ // Master page already exists when document is registered.
+ ET_MASTER_PAGE_EXISTS,
+ // Master page has been added to a document.
+ ET_MASTER_PAGE_ADDED,
+ // Master page has been removed from to a document.
+ ET_MASTER_PAGE_REMOVED
+ };
+
+ EventType meType;
+ SdDrawDocument& mrDocument;
+ const String& mrMasterPageName;
+
+ MasterPageObserverEvent (
+ EventType eType,
+ SdDrawDocument& rDocument,
+ const String& rMasterPageName)
+ : meType(eType),
+ mrDocument(rDocument),
+ mrMasterPageName(rMasterPageName)
+ {}
};
} // end of namespace sd
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/WindowUpdater.hxx
b/main/sd/source/ui/inc/WindowUpdater.hxx
index 7f8b6af34d..03f3278f35 100644
--- a/main/sd/source/ui/inc/WindowUpdater.hxx
+++ b/main/sd/source/ui/inc/WindowUpdater.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef SD_OUTPUT_DEVICE_UPDATER_HXX
#define SD_OUTPUT_DEVICE_UPDATER_HXX
@@ -37,112 +35,113 @@ class Window;
class OutputDevice;
class SdDrawDocument;
-
namespace sd {
class ViewShell;
/** The purpose of the <type>WindowUpdater</type> is to update output
- devices to take care of modified global values. These values are
- monitored for changes. At the moment this is
- the digit language that defines the glyphs to use to render digits.
- Other values may be added in the future.
-
- <p>The methods of this class have not been included into the
- <type>ViewShell</type> class in order to not clutter its interface any
- further. This class accesses some of <type>ViewShell</type> data
- members directly and thus is declared as its friend.</p>
-
- <p>Windows that are to be kept up-to-date have to be registered via the
- <member>RegisterWindow()</member> method. When a document is given then
- this document is reformatted when the monitored option changes.</p>
-*/
+ devices to take care of modified global values. These values are
+ monitored for changes. At the moment this is
+ the digit language that defines the glyphs to use to render digits.
+ Other values may be added in the future.
+
+ <p>The methods of this class have not been included into the
+ <type>ViewShell</type> class in order to not clutter its interface any
+ further. This class accesses some of <type>ViewShell</type> data
+ members directly and thus is declared as its friend.</p>
+
+ <p>Windows that are to be kept up-to-date have to be registered via the
+ <member>RegisterWindow()</member> method. When a document is given then
+ this document is reformatted when the monitored option changes.</p>
+ */
class SD_DLLPUBLIC WindowUpdater
- : public utl::ConfigurationListener
+ : public utl::ConfigurationListener
{
public:
- explicit WindowUpdater (void);
- virtual ~WindowUpdater (void) throw();
-
- /** Add the given device to the list of devices which will be updated
- when one of the monitored values changes.
- @param pWindow
- This device is added to the device list if it is not <null/> and
- when it is not already a member of that list.
- */
- void RegisterWindow (::Window* pWindow);
-
- /** Remove the given device from the list of devices which will be updated
- when one of the monitored values changes.
- @param pWindow
- This device is removed from the device list when it is a member
- of that list.
- */
- void UnregisterWindow (::Window* pWindow);
-
- /** Set the view shell whose output devices shall be kept up to date.
- It is used to clear the master page cache so that a redraw affects
- the master page content as well.
- */
- void SetViewShell (ViewShell& rViewShell);
-
- /** Set the document so that it is reformatted when one of the monitored
- values changes.
- @param pDocument
- When <null/> is given document reformatting will not take
- place in the future.
- */
- void SetDocument (SdDrawDocument* pDocument);
-
- /** Update the given output device and update all text objects of the
- view shell if not told otherwise.
- @param pWindow
- The device to update. When the given pointer is NULL then
- nothing is done.
- @param pDocument
- When given a pointer to a document then tell it to reformat all
- text objects. This refromatting is necessary for the new values
- to take effect.
- */
- void Update (OutputDevice* pDevice, SdDrawDocument* pDocument=0) const;
-
- /** Callback that waits for notifications of a
- <type>SvtCTLOptions</type> object.
- */
- virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*,
sal_uInt32 nHint);
+ explicit WindowUpdater (void);
+ virtual ~WindowUpdater (void) throw();
+
+ /** Add the given device to the list of devices which will be updated
+ when one of the monitored values changes.
+ @param pWindow
+ This device is added to the device list if it is not
<null/> and
+ when it is not already a member of that list.
+ */
+ void RegisterWindow (::Window* pWindow);
+
+ /** Remove the given device from the list of devices which will be
updated
+ when one of the monitored values changes.
+ @param pWindow
+ This device is removed from the device list when it is
a member
+ of that list.
+ */
+ void UnregisterWindow (::Window* pWindow);
+
+ /** Set the view shell whose output devices shall be kept up to date.
+ It is used to clear the master page cache so that a redraw
affects
+ the master page content as well.
+ */
+ void SetViewShell (ViewShell& rViewShell);
+
+ /** Set the document so that it is reformatted when one of the monitored
+ values changes.
+ @param pDocument
+ When <null/> is given document reformatting will not
take
+ place in the future.
+ */
+ void SetDocument (SdDrawDocument* pDocument);
+
+ /** Update the given output device and update all text objects of the
+ view shell if not told otherwise.
+ @param pWindow
+ The device to update. When the given pointer is NULL
then
+ nothing is done.
+ @param pDocument
+ When given a pointer to a document then tell it to
reformat all
+ text objects. This reformatting is necessary for the
new values
+ to take effect.
+ */
+ void Update (OutputDevice* pDevice, SdDrawDocument* pDocument=0) const;
+
+ /** Callback that waits for notifications of a
+ <type>SvtCTLOptions</type> object.
+ */
+ virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*,
sal_uInt32 nHint);
private:
- /// Options to monitor for changes.
- SvtCTLOptions maCTLOptions;
-
- /// Keep the output devices of this view shell up to date.
- ViewShell* mpViewShell;
-
- /// The document rendered in the output devices.
- SdDrawDocument* mpDocument;
-
- /// Copy constructor not supported.
- WindowUpdater (const WindowUpdater& rUpdater);
-
- /// Assignment operator not supported.
- WindowUpdater operator= (const WindowUpdater& rUpdater);
-
- /** Type and data member for a list of devices that have to be kept
- up-to-date.
- */
- typedef ::std::vector< ::Window*> tWindowList;
- tWindowList maWindowList;
-
- /** The central method of this class. Update the given output device.
- It is the task of the caller to initiate a refrormatting of the
- document that is rendered on this device to reflect the changes.
- @param pWindow
- The output device to update. When it is <null/> then the call
- is ignored.
- */
- SD_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const;
+ // Options to monitor for changes.
+ SvtCTLOptions maCTLOptions;
+
+ // Keep the output devices of this view shell up to date.
+ ViewShell* mpViewShell;
+
+ // The document rendered in the output devices.
+ SdDrawDocument* mpDocument;
+
+ // Copy constructor not supported.
+ WindowUpdater (const WindowUpdater& rUpdater);
+
+ // Assignment operator not supported.
+ WindowUpdater operator= (const WindowUpdater& rUpdater);
+
+ /** Type and data member for a list of devices that have to be kept
+ up-to-date.
+ */
+ typedef ::std::vector< ::Window*> tWindowList;
+ tWindowList maWindowList;
+
+ /** The central method of this class. Update the given output device.
+ It is the task of the caller to initiate a reformatting of the
+ document that is rendered on this device to reflect the changes.
+ @param pWindow
+ The output device to update. When it is <null/> then
the call
+ is ignored.
+ */
+ SD_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const;
};
} // end of namespace sd
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/slideshow.hxx
b/main/sd/source/ui/inc/slideshow.hxx
index d857a01c0f..7542582d78 100644
--- a/main/sd/source/ui/inc/slideshow.hxx
+++ b/main/sd/source/ui/inc/slideshow.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _SD_SLIDESHOW_HXX
#define _SD_SLIDESHOW_HXX
@@ -40,7 +38,7 @@
#include <boost/shared_ptr.hpp>
namespace com { namespace sun { namespace star {
-
+
namespace drawing {
class XDrawPage;
}
@@ -93,7 +91,7 @@ typedef ::cppu::WeakComponentImplHelper2<
::com::sun::star::presentation::XPrese
class SlideShow : private ::cppu::BaseMutex, public SlideshowBase
{
public:
- /// used by the model to create a slideshow for it
+ // used by the model to create a slideshow for it
static rtl::Reference< SlideShow > Create( SdDrawDocument* pDoc );
// static helper api
@@ -109,16 +107,16 @@ public:
static void Stop( ViewShellBase& rBase );
- /// returns true if there is a running presentation for the given
ViewShellBase
+ // returns true if there is a running presentation for the given
ViewShellBase
static bool IsRunning( ViewShellBase& rBase );
- /// returns true if there is a running presentation inside the given
ViewShell
- /// returns false even if there is a running presentation but in
another ViewShell
+ // returns true if there is a running presentation inside the given
ViewShell
+ // returns false even if there is a running presentation but in another
ViewShell
static bool IsRunning( ViewShell& rViewShell );
// helper api
- bool startPreview(
+ bool startPreview(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage >& xDrawPage,
const ::com::sun::star::uno::Reference<
::com::sun::star::animations::XAnimationNode >& xAnimationNode,
::Window* pParent = 0 );
@@ -128,35 +126,35 @@ public:
virtual void SAL_CALL disposing (void);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
// XPropertySet
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString&
aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
::rtl::OUString& PropertyName ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const ::rtl::OUString&
aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
::rtl::OUString& PropertyName ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const
::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString&
PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const
::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
// XPresentation
- virtual void SAL_CALL start( ) throw
(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL end( ) throw
(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL rehearseTimings( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL start( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL end( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL rehearseTimings( ) throw
(::com::sun::star::uno::RuntimeException);
- // XPresentation2
- virtual void SAL_CALL startWithArguments( const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&
Arguments ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL isRunning( ) throw
(::com::sun::star::uno::RuntimeException);
+ // XPresentation2
+ virtual void SAL_CALL startWithArguments( const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&
Arguments ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isRunning( ) throw
(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::presentation::XSlideShowController > SAL_CALL getController(
) throw (::com::sun::star::uno::RuntimeException);
// legacy api
- // actions
- void jumpToPageNumber( sal_Int32 nPage );
// a.k.a. FuSlideShow::JumpToPage()
+ // actions
+ void jumpToPageNumber( sal_Int32 nPage ); // a.k.a.
FuSlideShow::JumpToPage()
void jumpToPageIndex( sal_Int32 nIndex );
- void jumpToBookmark( const ::rtl::OUString& sBookmark );
// a.k.a. FuSlideShow::JumpToBookmark()
+ void jumpToBookmark( const ::rtl::OUString& sBookmark ); // a.k.a.
FuSlideShow::JumpToBookmark()
/** sets or clears the pause state of the running slideshow.
!!!! This should only be called by the SdShowWindow !!!!*/
@@ -181,7 +179,7 @@ public:
void paint( const Rectangle& rRect );
bool keyInput(const KeyEvent& rKEvt);
-
+
void receiveRequest(SfxRequest& rReq);
bool dependsOn( ViewShellBase* pViewShellBase );
@@ -201,18 +199,18 @@ private:
void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window*
pParentWindow );
- // default: disabled copy/assignment
+ // default: disabled copy/assignment
SlideShow(const SlideShow&);
SlideShow& operator=( const SlideShow& );
SvxItemPropertySet maPropSet;
rtl::Reference< SlideshowImpl > mxController;
- /** This flag is used together with mxController.is() to prevent
- multiple instances of the slide show for one document. The flag
- covers the time before mxController is set.
- */
- bool mbIsInStartup;
+ /** This flag is used together with mxController.is() to prevent
+ multiple instances of the slide show for one document. The flag
+ covers the time before mxController is set.
+ */
+ bool mbIsInStartup;
SdDrawDocument* mpDoc;
boost::shared_ptr< PresentationSettingsEx > mxCurrentSettings;
@@ -226,3 +224,5 @@ private:
}
#endif /* _SD_SLIDESHOW_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/taskpane/TitleBar.hxx
b/main/sd/source/ui/inc/taskpane/TitleBar.hxx
index dc7cc06794..e4baf702bb 100644
--- a/main/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/main/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef SD_TASKPANE_TITLE_BAR_HXX
#define SD_TASKPANE_TITLE_BAR_HXX
@@ -36,7 +34,6 @@ class VirtualDevice;
namespace sd { namespace toolpanel {
-
/** The title bar above a control in a sub tool panel.
<p>The title bar shows two kinds of indicators: 1) Expansion is
@@ -56,7 +53,7 @@ public:
/** Create a new title bar whose content, the given title string,
will be formatted according to the given type.
- */
+ */
TitleBar (
::Window* pParent,
const String& rsTitle,
@@ -80,10 +77,10 @@ public:
virtual void MouseMove(const MouseEvent& rEvent);
/** Empty implementation prevents forwarding to docking window.
- */
+ */
virtual void MouseButtonDown (const MouseEvent& rEvent);
/** Empty implementation prevents forwarding to docking window.
- */
+ */
virtual void MouseButtonUp (const MouseEvent& rEvent);
virtual void DataChanged (const DataChangedEvent& rEvent);
@@ -107,7 +104,7 @@ private:
/** Return whether this TitleBar object has an expansion indicator
bitmap. It is safe to call GetExpansionIndicator() when this
method
returns <FALSE/> but unnecessary.
- */
+ */
bool HasExpansionIndicator (void) const;
/** Return the image of the expansion indicator.
@@ -115,7 +112,7 @@ private:
When there is no expansion indicator for this TitleBar
object,
then an empty Image is returned. You better call
HasExpansionIndicator() to prevent this.
- */
+ */
Image GetExpansionIndicator (void) const;
/** Calculate the bounding box of the title text. This takes into
@@ -125,14 +122,14 @@ private:
@param nAvailableWidth
When 0 is given then the natural text width is used,
i.e. the
text is not broken into multiple lines.
- */
+ */
Rectangle CalculateTextBoundingBox (
int nAvailableWidth,
bool bEmphasizeExpanded);
/** Add some space to the given text box and return the bounding box of
the title bar.
- */
+ */
Rectangle CalculateTitleBarBox (
const Rectangle& rTextBox,
int nTitleBarWidth);
@@ -141,7 +138,7 @@ private:
void PaintBackground (const Rectangle& rTextBox);
- /// Paint a focus indicator that encloses the given rectangle.
+ // Paint a focus indicator that encloses the given rectangle.
void PaintFocusIndicator (const Rectangle& rIndicatorBox);
Rectangle PaintExpansionIndicator (const Rectangle& rTextBox);
@@ -163,3 +160,5 @@ private:
} } // end of namespace ::sd::toolpanel
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/inc/taskpane/TitledControl.hxx
b/main/sd/source/ui/inc/taskpane/TitledControl.hxx
index 41d161f45e..048e2bae82 100644
--- a/main/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/main/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef SD_TASKPANE_TITLED_CONTROL_HXX
#define SD_TASKPANE_TITLED_CONTROL_HXX
@@ -94,7 +92,7 @@ public:
/** Return the control child. When a control factory has been given and
the control has not yet been created and the given flag is
<TRUE/>
then the control is created.
- */
+ */
TreeNode* GetControl (void);
const TreeNode* GetConstControl () const;
@@ -107,16 +105,16 @@ public:
@param bExpanded
When <TRUE/> then the control is expanded, otherwise it
is
collapsed.
- */
+ */
virtual bool Expand (bool bExpanded = true);
/** Return whether the control is currently expanded (<TRUE/>) or
not (<FALSE/>).
- */
+ */
virtual bool IsExpanded (void) const;
/** Returns the value of the control.
- */
+ */
virtual bool IsExpandable (void) const;
virtual void SetEnabledState(bool bFlag);
@@ -138,7 +136,7 @@ private:
void* mpUserData;
::std::auto_ptr<ClickHandler> mpClickHandler;
- /// Do not use! Assignment operator is not supported.
+ // Do not use! Assignment operator is not supported.
const TitledControl& operator= (
const TitledControl& aDescriptor);
@@ -148,8 +146,6 @@ private:
};
-
-
/** This standard implementation of the ClickHandler expands, or toggles the
expansion state, of the control, whose title was clicked.
*/
@@ -175,3 +171,5 @@ private:
} } // end of namespace ::sd::toolpanel
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
b/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index 43d812a7d3..5b7c5b1851 100644
--- a/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/main/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef SD_SIDEBAR_PANELS_RECENTLY_USED_MASTER_PAGES_HXX
#define SD_SIDEBAR_PANELS_RECENTLY_USED_MASTER_PAGES_HXX
@@ -41,17 +39,16 @@ namespace sd {
class MasterPageObserverEvent;
}
-
namespace sd { namespace sidebar {
/** This singleton holds a list of the most recently used master pages.
-*/
+ */
class RecentlyUsedMasterPages
: public SdGlobalResource
{
public:
/** Return the single instance of this class.
- */
+ */
static RecentlyUsedMasterPages& Instance (void);
void AddEventListener (const Link& rEventListener);
@@ -63,7 +60,7 @@ public:
private:
/** The single instance of this class. It is created on demand when
Instance() is called for the first time.
- */
+ */
static RecentlyUsedMasterPages* mpInstance;
::std::vector<Link> maListeners;
@@ -77,13 +74,13 @@ private:
virtual ~RecentlyUsedMasterPages (void);
/** Call this method after a new object has been created.
- */
+ */
void LateInit (void);
- /// The copy constructor is not implemented. Do not use!
+ // The copy constructor is not implemented. Do not use!
RecentlyUsedMasterPages (const RecentlyUsedMasterPages&);
- /// The assignment operator is not implemented. Do not use!
+ // The assignment operator is not implemented. Do not use!
RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&);
void SendEvent (void);
@@ -99,26 +96,26 @@ private:
pages is written back into the configuration to make it
persistent. Giving <FALSE/> to omit this is used while
loading
the persistent list from the configuration.
- */
+ */
void AddMasterPage (
MasterPageContainer::Token aToken,
bool bMakePersistent = true);
/** Load the list of recently used master pages from the registry where
it was saved to make it persistent.
- */
+ */
void LoadPersistentValues (void);
/** Save the list of recently used master pages to the registry to make
it persistent.
- */
+ */
void SavePersistentValues (void);
void ResolveList (void);
};
-
-
} } // end of namespace sd::sidebar
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/sidebar/SidebarShellManager.hxx
b/main/sd/source/ui/sidebar/SidebarShellManager.hxx
index d7f2777b52..6e1c6891f6 100644
--- a/main/sd/source/ui/sidebar/SidebarShellManager.hxx
+++ b/main/sd/source/ui/sidebar/SidebarShellManager.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef SD_SIDEBAR_SHELL_MANAGER_HXX
#define SD_SIDEBAR_SHELL_MANAGER_HXX
@@ -40,78 +38,80 @@ class ViewShell;
namespace sd { namespace sidebar {
/** The TaskPaneShellManager implements the ViewShellManager::ShellFactory
- interface. However, it does not create or delete shells. It only
- gives the ViewShellManager access to the sub shells of the
- ToolPanelViewShell. Life time control of the sub shells is managed by
- the sub shells themselves.
+ interface. However, it does not create or delete shells. It only
+ gives the ViewShellManager access to the sub shells of the
+ ToolPanelViewShell. Life time control of the sub shells is managed by
+ the sub shells themselves.
*/
class SidebarShellManager
- : public ShellFactory<SfxShell>
+ : public ShellFactory<SfxShell>
{
public:
- /** Create a shell manager that manages the stacked shells for the given
- view shell. It works together with the given view shell manager.
- */
- SidebarShellManager (
- const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
- const ViewShell& rViewShell);
- ~SidebarShellManager (void);
-
- /** Return the requested sub shell.
- @param nId
- The id of the requested sub shell.
- @return
- When there is no sub shell currently registered under the given
- id then NULL is returned.
- */
- virtual SfxShell* CreateShell (
- ShellId nId,
- ::Window* pParentWindow,
- FrameView* pFrameView = NULL);
-
- virtual void ReleaseShell (SfxShell* pShell);
-
- /** Add a sub shell to the set of sub shells managed by the
- TaskPaneShellManager. Only shells added by this method are returned
- by CreateShell().
- */
- void AddSubShell (ShellId nId, SfxShell* pShell, ::Window* pWindow);
-
- /** Remove the given shell from the set of sub shells managed by the
- TaskPaneShellManager. Following calls to CreateShell() will return
- NULL when this shell is requested.
- */
- void RemoveSubShell (const SfxShell* pShell);
- /** removes the shell given by its ID from the set of sub shells managed
by the
- TaskPaneShellManager. Subsequent calls to CreateShell() will return
- NULL when this shell is requested.
- */
- void RemoveSubShell (const ShellId i_nShellId);
-
- /** Move the given sub-shell to the top of the local shell stack.
- Furthermore move the view shell whose sub-shells this class manages
- to the top of the global shell stack.
- */
- void MoveToTop (SfxShell* pShell);
-
- DECL_LINK(WindowCallback,VclWindowEvent*);
+ /** Create a shell manager that manages the stacked shells for the given
+ view shell. It works together with the given view shell
manager.
+ */
+ SidebarShellManager (
+ const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager,
+ const ViewShell& rViewShell);
+ ~SidebarShellManager (void);
+
+ /** Return the requested sub shell.
+ @param nId
+ The id of the requested sub shell.
+ @return
+ When there is no sub shell currently registered under
the given
+ id then NULL is returned.
+ */
+ virtual SfxShell* CreateShell (
+ ShellId nId,
+ ::Window* pParentWindow,
+ FrameView* pFrameView = NULL);
+
+ virtual void ReleaseShell (SfxShell* pShell);
+
+ /** Add a sub shell to the set of sub shells managed by the
+ TaskPaneShellManager. Only shells added by this method are
returned
+ by CreateShell().
+ */
+ void AddSubShell (ShellId nId, SfxShell* pShell, ::Window* pWindow);
+
+ /** Remove the given shell from the set of sub shells managed by the
+ TaskPaneShellManager. Following calls to CreateShell() will
return
+ NULL when this shell is requested.
+ */
+ void RemoveSubShell (const SfxShell* pShell);
+ /** removes the shell given by its ID from the set of sub shells
managed by the
+ TaskPaneShellManager. Subsequent calls to CreateShell() will
return
+ NULL when this shell is requested.
+ */
+ void RemoveSubShell (const ShellId i_nShellId);
+
+ /** Move the given sub-shell to the top of the local shell stack.
+ Furthermore move the view shell whose sub-shells this class
manages
+ to the top of the global shell stack.
+ */
+ void MoveToTop (SfxShell* pShell);
+
+ DECL_LINK(WindowCallback,VclWindowEvent*);
private:
- ::boost::shared_ptr<ViewShellManager> mpViewShellManager;
-
- /// The view shell whose sub-shells this class manages.
- const ViewShell& mrViewShell;
-
- class ShellDescriptor { public:
- SfxShell* mpShell;
- ::Window* mpWindow;
- ShellDescriptor(void) : mpShell(NULL),mpWindow(NULL){}
- ShellDescriptor(SfxShell*pShell,::Window*pWindow) :
mpShell(pShell),mpWindow(pWindow){}
- };
- typedef ::std::map<ShellId,ShellDescriptor> SubShells;
- SubShells maSubShells;
+ ::boost::shared_ptr<ViewShellManager> mpViewShellManager;
+
+ // The view shell whose sub-shells this class manages.
+ const ViewShell& mrViewShell;
+
+ class ShellDescriptor { public:
+ SfxShell* mpShell;
+ ::Window* mpWindow;
+ ShellDescriptor(void) : mpShell(NULL),mpWindow(NULL){}
+ ShellDescriptor(SfxShell*pShell,::Window*pWindow) :
mpShell(pShell),mpWindow(pWindow){}
+ };
+ typedef ::std::map<ShellId,ShellDescriptor> SubShells;
+ SubShells maSubShells;
};
} } // end of namespace ::sd::sidebar
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
b/main/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
index 9bddafd9f1..2616b21ffc 100644
--- a/main/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
+++ b/main/sd/source/ui/slidesorter/controller/SlsSelectionCommand.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,20 +7,18 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef SD_SLIDESORTER_SELECTION_COMMAND_HXX
#define SD_SLIDESORTER_SELECTION_COMMAND_HXX
@@ -36,56 +34,57 @@ namespace sd { namespace slidesorter { namespace model {
class SlideSorterModel;
} } }
-
namespace sd { namespace slidesorter { namespace controller {
class CurrentSlideManager;
class PageSelector;
/** The SelectionCommand stores a list of pages that it will select on its
- execution. Furthermore it will make a page the current page. Note that
- internally pages are stored with pointers because this command is designed
- to be executed after model changes where page indices may change but
- page object identities remain.
-*/
+ execution. Furthermore it will make a page the current page. Note that
+ internally pages are stored with pointers because this command is
designed
+ to be executed after model changes where page indices may change but
+ page object identities remain.
+ */
class SelectionCommand
- : public Command
+ : public Command
{
public:
- /** Create a new command object that will on its execution use the given
- PageSelector to select a set of pages.
- */
- SelectionCommand (
- PageSelector& rSelector,
- const ::boost::shared_ptr<controller::CurrentSlideManager>&
rpCurrentSlideManager,
- const model::SlideSorterModel& rModel);
+ /** Create a new command object that will on its execution use the given
+ PageSelector to select a set of pages.
+ */
+ SelectionCommand (
+ PageSelector& rSelector,
+ const ::boost::shared_ptr<controller::CurrentSlideManager>&
rpCurrentSlideManager,
+ const model::SlideSorterModel& rModel);
- /** Remember the specified page to be selected when this command is
- executed.
- */
- void AddSlide (sal_uInt16 nPageIndex);
+ /** Remember the specified page to be selected when this command is
+ executed.
+ */
+ void AddSlide (sal_uInt16 nPageIndex);
- /** Execute the command and select the pages added by previous calls to
- AddPages() and AddPage().
- */
- virtual void operator() (void);
+ /** Execute the command and select the pages added by previous calls to
+ AddPages() and AddPage().
+ */
+ virtual void operator() (void);
private:
- /// The page selector is used to select pages and set the current page.
- PageSelector& mrPageSelector;
- /// Used for setting the current slide.
- ::boost::shared_ptr<controller::CurrentSlideManager> mpCurrentSlideManager;
- /// The model is used to translate page indices into page pointers.
- const model::SlideSorterModel& mrModel;
- /// The list of pages to be selected when the command is executed.
- typedef ::std::vector<sal_Int32> PageList;
- PageList maPagesToSelect;
- /** The page that will be made the current page when the command is
- executed.
- */
- sal_Int32 mnCurrentPageIndex;
+ // The page selector is used to select pages and set the current page.
+ PageSelector& mrPageSelector;
+ // Used for setting the current slide.
+ ::boost::shared_ptr<controller::CurrentSlideManager>
mpCurrentSlideManager;
+ // The model is used to translate page indices into page pointers.
+ const model::SlideSorterModel& mrModel;
+ // The list of pages to be selected when the command is executed.
+ typedef ::std::vector<sal_Int32> PageList;
+ PageList maPagesToSelect;
+ /** The page that will be made the current page when the command is
+ executed.
+ */
+ sal_Int32 mnCurrentPageIndex;
};
} } } // end of namespace sd::slidesorter::controller
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
b/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index f0689eb914..bd577e589a 100644
--- a/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/main/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#ifndef SD_SLIDESORTER_SLOT_MANAGER_HXX
#define SD_SLIDESORTER_SLOT_MANAGER_HXX
@@ -38,25 +36,24 @@ namespace sd { namespace slidesorter {
class SlideSorter;
} }
-
namespace sd { namespace slidesorter { namespace controller {
class Command;
/** This manager takes over the work of handling slot calls from the
- controller of the slide sorter.
-*/
+ controller of the slide sorter.
+ */
class SlotManager
{
public:
- /** Create a new slot manager that handles slot calls for the controller
- of a slide sorter.
- @param rController
- The controller for which to handle the slot calls.
- */
- SlotManager (SlideSorter& rSlideSorter);
+ /** Create a new slot manager that handles slot calls for the controller
+ of a slide sorter.
+ @param rController
+ The controller for which to handle the slot calls.
+ */
+ SlotManager (SlideSorter& rSlideSorter);
- ~SlotManager (void);
+ ~SlotManager (void);
void FuTemporary (SfxRequest& rRequest);
void FuPermanent (SfxRequest& rRequest);
@@ -67,55 +64,57 @@ public:
void ExecCtrl (SfxRequest& rRequest);
void GetAttrState (SfxItemSet& rSet);
- void ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand);
+ void ExecuteCommandAsynchronously (::std::auto_ptr<Command> pCommand);
- /** Exclude or include one slide or all selected slides.
- @param rpDescriptor
- When the pointer is empty then apply the new state to all
- selected pages. Otherwise apply the new state to just the
- specified state.
- */
- void ChangeSlideExclusionState (
- const model::SharedPageDescriptor& rpDescriptor,
- const bool bExcludeSlide);
+ /** Exclude or include one slide or all selected slides.
+ @param rpDescriptor
+ When the pointer is empty then apply the new state to
all
+ selected pages. Otherwise apply the new state to just
the
+ specified state.
+ */
+ void ChangeSlideExclusionState (
+ const model::SharedPageDescriptor& rpDescriptor,
+ const bool bExcludeSlide);
- /** Call this after a change from normal mode to master mode or back.
- The affected slots are invalidated.
- */
- void NotifyEditModeChange (void);
+ /** Call this after a change from normal mode to master mode or back.
+ The affected slots are invalidated.
+ */
+ void NotifyEditModeChange (void);
private:
- /// The controller for which we manage the slot calls.
- SlideSorter& mrSlideSorter;
+ // The controller for which we manage the slot calls.
+ SlideSorter& mrSlideSorter;
- typedef ::std::queue<Command*> CommandQueue;
- CommandQueue maCommandQueue;
+ typedef ::std::queue<Command*> CommandQueue;
+ CommandQueue maCommandQueue;
- /** Called by FuTemporary to show the slide show.
- */
- void ShowSlideShow (SfxRequest& rRequest);
+ /** Called by FuTemporary to show the slide show.
+ */
+ void ShowSlideShow (SfxRequest& rRequest);
- /** The implementation is a copy of the code for SID_RENAMEPAGE in
- drviews2.cxx.
- */
- void RenameSlide (void);
- DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*);
- bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String&
rName);
+ /** The implementation is a copy of the code for SID_RENAMEPAGE in
+ drviews2.cxx.
+ */
+ void RenameSlide (void);
+ DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*);
+ bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String&
rName);
- /** Handle SID_INSERTPAGE slot calls.
- */
- void InsertSlide (SfxRequest& rRequest);
+ /** Handle SID_INSERTPAGE slot calls.
+ */
+ void InsertSlide (SfxRequest& rRequest);
- void DuplicateSelectedSlides (SfxRequest& rRequest);
+ void DuplicateSelectedSlides (SfxRequest& rRequest);
- /** Use one of several ways to determine where to insert a new page.
- This can be the current selection or the insertion indicator.
- */
- sal_Int32 GetInsertionPosition (void);
+ /** Use one of several ways to determine where to insert a new page.
+ This can be the current selection or the insertion indicator.
+ */
+ sal_Int32 GetInsertionPosition (void);
- DECL_LINK(UserEventCallback, void*);
+ DECL_LINK(UserEventCallback, void*);
};
} } } // end of namespace ::sd::slidesorter::controller
#endif
+
+/* vim: set noet sw=4 ts=4: */
