diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:25 -0400 |
| commit | 8dcf22abfc6a07ececcef6bb830fdea825d416ec (patch) | |
| tree | 7e0b3686991aef9689218ed309f462987f36e273 | |
| parent | b91e39cf1b2d0c4201993d768a1b2c686eeff0de (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit a238b1f8d304bf1e2ffb357937f3ec888ee8ac89)
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
2826 files changed, 0 insertions, 13728 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index a2b07a5cced5..36d26456e2c7 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -33,7 +33,6 @@ namespace accessibility { class AccessibleBrowseBoxTable; - /** This class represents the complete accessible BrowseBox object. */ class AccessibleBrowseBox : public AccessibleBrowseBoxBase { @@ -284,7 +283,6 @@ private: } // namespace accessibility - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 89513226d9a5..356fe3a4dc58 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -46,7 +46,6 @@ #include <comphelper/uno3.hxx> - namespace vcl { class Window; } namespace utl { @@ -445,7 +444,6 @@ inline void AccessibleBrowseBoxBase::implSetName( } // namespace accessibility - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx index 544ba078b2ba..3e4e91b3a1cc 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -26,11 +26,9 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> - namespace accessibility { - typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > AccessibleBrowseBoxHeaderBarImplHelper; @@ -250,11 +248,9 @@ inline bool AccessibleBrowseBoxHeaderBar::isColumnBar() const } - } // namespace accessibility - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx index b9a3fcc8878e..7f47fd2feaee 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx @@ -147,11 +147,9 @@ protected: }; - } // namespace accessibility - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx index d20dc11fd197..0c60cca4a15a 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/accessibility/XAccessibleTable.hpp> - namespace accessibility { typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleTable > @@ -259,11 +258,9 @@ protected: }; - } // namespace accessibility - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 45d4c2089219..3518a9fff9db 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -32,7 +32,6 @@ namespace accessibility { class AccessibleGridControl_Impl; - /** This class represents the complete accessible Grid Control object. */ class AccessibleGridControl : public AccessibleGridControlBase { @@ -236,7 +235,6 @@ private: } // namespace accessibility - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index c844c040f4d6..a3e605f8f637 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -42,7 +42,6 @@ #include <comphelper/uno3.hxx> - namespace vcl { class Window; } namespace utl { @@ -359,7 +358,6 @@ inline void AccessibleGridControlBase::implSetName( } // namespace accessibility - #endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index 927014a6024a..a5219f12f599 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx @@ -176,11 +176,9 @@ inline bool AccessibleGridControlHeader::isColumnBar() const } - } // namespace accessibility - #endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLHEADER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index 26ebe5f43a58..952708f09793 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx @@ -27,7 +27,6 @@ #include <accessibility/extended/AccessibleGridControlTableCell.hxx> - namespace accessibility { @@ -203,11 +202,9 @@ protected: }; - } // namespace accessibility - #endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index 91b1687c7483..787a55f14e77 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/accessibility/XAccessibleTable.hpp> - namespace accessibility { typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleTable > @@ -201,11 +200,9 @@ protected: }; - } // namespace accessibility - #endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLEBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx index b1a22404946e..bafb0590da5c 100644 --- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx @@ -28,7 +28,6 @@ namespace accessibility { - // = AccessibleBrowseBoxCell /** common accessibility-functionality for browse box elements which occupy a cell @@ -73,7 +72,6 @@ namespace accessibility } // namespace accessibility - #endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/accessibility/extended/accessibletabbar.hxx index bf72a4b5b879..60c8d52a78f7 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbar.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbar.hxx @@ -36,7 +36,6 @@ namespace accessibility { - // class AccessibleTabBar diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx index 2bf959173aa6..6626a1a488c5 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx @@ -62,8 +62,6 @@ protected: }; - - } // namespace accessibility diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx index 0d80192d3073..8904a14bd7b0 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx @@ -36,7 +36,6 @@ namespace accessibility { - // class AccessibleTabBarPage diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx index b5d8ae4cad40..a9d7556ba105 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx @@ -37,7 +37,6 @@ namespace accessibility { - // class AccessibleTabBarPageList diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx index a0edbd072774..bfc9e2a2c80e 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx @@ -28,7 +28,6 @@ class SvHeaderTabListBox; - namespace accessibility { class AccessibleBrowseBoxTable; @@ -97,11 +96,9 @@ protected: }; - } // namespace accessibility - #endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx index 29efcc3b2a61..4c79a9962871 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx @@ -28,7 +28,6 @@ class SvHeaderTabListBox; - namespace accessibility { typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection > @@ -102,11 +101,9 @@ public: }; - } // namespace accessibility - #endif // INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETABLISTBOXTABLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx index c475d9ffca9e..28dfa14995f2 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx @@ -25,7 +25,6 @@ #include <cppuhelper/implbase1.hxx> - // class OAccessibleMenuComponent diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx index f0d6015952a2..2bcf01f60882 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx @@ -23,7 +23,6 @@ #include <accessibility/standard/accessiblemenubasecomponent.hxx> - // class OAccessibleMenuItemComponent diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx index 393cac094421..ea4a8deb006c 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx @@ -59,7 +59,6 @@ public: DECLARE_XINTERFACE() - // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx index c290ab492456..8f0a8f1fa42b 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase2.hxx> - // class VCLXAccessibleButton diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx index 903ba836e2aa..db0f699e98b7 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase2.hxx> - // class VCLXAccessibleCheckBox diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx index 894e5a940e79..7e395620a410 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/implbase2.hxx> - // class VCLXAccessibleEdit diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx index 88cc124f49e7..58484dba443e 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx @@ -26,7 +26,6 @@ #include <cppuhelper/implbase1.hxx> - // class VCLXAccessibleMenu diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx index 6b0e29b32c33..261256a0e938 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx @@ -28,7 +28,6 @@ class VclWindowEvent; namespace vcl { class Window; } - // class VCLXAccessibleMenuBar diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx index 6411872fe062..19d39f53202f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx @@ -29,7 +29,6 @@ #include <comphelper/accessibletexthelper.hxx> - // class VCLXAccessibleMenuItem diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx index 6bba17d9250c..4e3250b06f7b 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx @@ -23,7 +23,6 @@ #include <accessibility/standard/accessiblemenuitemcomponent.hxx> - // class VCLXAccessibleMenuSeparator diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx index 10d008d81096..d91ed83b2be5 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx @@ -23,7 +23,6 @@ #include <accessibility/standard/accessiblemenucomponent.hxx> - // class VCLXAccessiblePopupMenu diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx index 2c6cc0a2ee55..ed0ac66abdca 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase2.hxx> - // class VCLXAccessibleRadioButton diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx index c8cebb33d6b0..6b8617f75ebf 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase2.hxx> - // class VCLXAccessibleScrollBar diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx index 507191bc26cb..6e4b56f6e6e2 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx @@ -34,7 +34,6 @@ class AccessibleStateSetHelper; } - // class VCLXAccessibleStatusBarItem diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx index f40ed4e3b957..bfcbab4a8cd1 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx @@ -29,7 +29,6 @@ class TabControl; - // class VCLXAccessibleTabControl diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx index d86b53d947cb..4749e6dd9a5d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx @@ -35,7 +35,6 @@ class AccessibleStateSetHelper; } - // class VCLXAccessibleTabPage diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx index 88ceee57f401..391b14d3a6ab 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx @@ -28,7 +28,6 @@ class TabControl; class TabPage; - // class VCLXAccessibleTabPageWindow diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx index 1953c6f92857..10390f508616 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx @@ -24,7 +24,6 @@ #include <comphelper/accessibletexthelper.hxx> - // class VCLXAccessibleTextComponent diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 1ce402dd3309..86a2eadee4c4 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -27,7 +27,6 @@ #include <unotools/accessiblerelationsethelper.hxx> - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -38,8 +37,6 @@ using namespace ::comphelper; using namespace ::svt; - - namespace accessibility { using namespace com::sun::star::accessibility::AccessibleStateType; @@ -575,9 +572,7 @@ BrowseBoxAccessibleElement::~BrowseBoxAccessibleElement( ) } - } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 22b0ebcdf128..07225c233181 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -22,7 +22,6 @@ #include <comphelper/servicehelper.hxx> - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -32,11 +31,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::svt; - namespace accessibility { - // Ctor/Dtor/disposing -------------------------------------------------------- AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar( @@ -384,9 +381,7 @@ void AccessibleBrowseBoxHeaderBar::ensureIsValidHeaderIndex( sal_Int32 nIndex ) } - } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 65e707ca86cc..c7332aafbea2 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -161,5 +161,4 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index 4bf01ef380f7..9e35902bf565 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -21,7 +21,6 @@ #include <svtools/accessibletableprovider.hxx> - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -31,11 +30,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::svt; - namespace accessibility { - // Ctor/Dtor/disposing -------------------------------------------------------- AccessibleBrowseBoxTable::AccessibleBrowseBoxTable( @@ -246,9 +243,7 @@ Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar( } - } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 7b65f04e8d77..43faaca52cdc 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -24,7 +24,6 @@ #include <comphelper/servicehelper.hxx> - using css::uno::Reference; using css::uno::Sequence; using css::uno::Any; @@ -34,11 +33,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::svt; - namespace accessibility { - // Ctor/Dtor/disposing -------------------------------------------------------- AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase( @@ -328,9 +325,7 @@ void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) } - } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 4b5e0458cc64..b962873abb0d 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -28,12 +28,10 @@ #include <toolkit/helper/vclunohelper.hxx> - namespace accessibility { - using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -398,7 +396,6 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe // = AccessibleGridControlAccess - AccessibleGridControlAccess::AccessibleGridControlAccess( const Reference< XAccessible >& rxParent, IAccessibleTable& rTable ) : m_xParent( rxParent ) @@ -449,7 +446,6 @@ bool AccessibleGridControlAccess::isContextAlive() const } - } // namespace accessibility /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 846ed6626d25..996f0baafdea 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -483,9 +483,7 @@ GridControlAccessibleElement::~GridControlAccessibleElement( ) } - } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 7e43f46ba85a..4367ee75b796 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -24,8 +24,6 @@ #include <comphelper/servicehelper.hxx> - - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -38,11 +36,9 @@ using namespace ::svt; using namespace ::svt::table; - namespace accessibility { - AccessibleGridControlHeader::AccessibleGridControlHeader( const Reference< XAccessible >& rxParent, ::svt::table::IAccessibleTable& rTable, diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 0e5168f52335..0ce82c76adaa 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -115,7 +115,6 @@ Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC } - /** Grabs the focus to the column header. */ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() throw ( css::uno::RuntimeException, std::exception ) @@ -170,5 +169,4 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 20df49fd0a6d..faff58d6018e 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -22,7 +22,6 @@ #include <svtools/accessibletable.hxx> - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; @@ -36,7 +35,6 @@ using namespace ::svt::table; namespace accessibility { - AccessibleGridControlTable::AccessibleGridControlTable( const Reference< XAccessible >& rxParent, IAccessibleTable& rTable, @@ -390,10 +388,7 @@ Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar( } - - } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 6f30fd7bbbf6..a226b6e9c9ff 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -24,7 +24,6 @@ #include <comphelper/servicehelper.hxx> - using css::uno::Reference; using css::uno::Sequence; using css::uno::Any; @@ -35,11 +34,9 @@ using namespace ::svt; using namespace ::svt::table; - namespace accessibility { - AccessibleGridControlTableBase::AccessibleGridControlTableBase( const Reference< XAccessible >& rxParent, IAccessibleTable& rTable, @@ -272,9 +269,7 @@ void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) } - } // namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index bf53d172d1dd..2bc60c1434b0 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -48,7 +48,6 @@ namespace accessibility using namespace ::svt::table; - // = AccessibleGridControlCell diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 269938449dca..8ee736e571d6 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -106,7 +106,6 @@ namespace accessibility } - Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const { Rectangle aRect; @@ -1124,7 +1123,6 @@ namespace accessibility } - sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1156,7 +1154,6 @@ namespace accessibility } - Any AccessibleListBoxEntry::getMaximumValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1177,7 +1174,6 @@ namespace accessibility } - Any AccessibleListBoxEntry::getMinimumValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1198,7 +1194,6 @@ namespace accessibility } - SvTreeListEntry* AccessibleListBoxEntry::GetRealChild(sal_Int32 nIndex) { SvTreeListEntry* pEntry = nullptr; diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index b020513c7228..35eba39f0ffc 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -34,7 +34,6 @@ #include <vector> - namespace accessibility { @@ -57,13 +56,11 @@ namespace accessibility } - AccessibleTabBar::~AccessibleTabBar() { } - void AccessibleTabBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { Any aOldValue, aNewValue; @@ -119,7 +116,6 @@ namespace accessibility } - void AccessibleTabBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { if ( m_pTabBar ) @@ -198,14 +194,12 @@ namespace accessibility } - sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleTabBar" }; @@ -235,7 +229,6 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -270,7 +263,6 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBar::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -287,7 +279,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBar::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -314,7 +305,6 @@ namespace accessibility } - sal_Int16 AccessibleTabBar::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -323,7 +313,6 @@ namespace accessibility } - OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -336,7 +325,6 @@ namespace accessibility } - OUString AccessibleTabBar::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -349,7 +337,6 @@ namespace accessibility } - Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -360,7 +347,6 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -381,7 +367,6 @@ namespace accessibility } - Locale AccessibleTabBar::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -421,7 +406,6 @@ namespace accessibility } - void AccessibleTabBar::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -431,7 +415,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBar::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -456,7 +439,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBar::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -502,7 +484,6 @@ namespace accessibility } - OUString AccessibleTabBar::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -515,7 +496,6 @@ namespace accessibility } - OUString AccessibleTabBar::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -528,8 +508,6 @@ namespace accessibility } - - } // namespace accessibility diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 8ce47ce1a61c..85f5311d8c3c 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -30,7 +30,6 @@ #include <toolkit/helper/convert.hxx> - namespace accessibility { @@ -59,13 +58,11 @@ namespace accessibility } - AccessibleTabBarPage::~AccessibleTabBarPage() { } - bool AccessibleTabBarPage::IsEnabled() { OExternalLockGuard aGuard( this ); @@ -78,7 +75,6 @@ namespace accessibility } - bool AccessibleTabBarPage::IsShowing() { bool bShowing = false; @@ -90,7 +86,6 @@ namespace accessibility } - bool AccessibleTabBarPage::IsSelected() { bool bSelected = false; @@ -117,7 +112,6 @@ namespace accessibility } - void AccessibleTabBarPage::SetSelected( bool bSelected ) { if ( m_bSelected != bSelected ) @@ -133,7 +127,6 @@ namespace accessibility } - void AccessibleTabBarPage::SetPageText( const OUString& sPageText ) { if ( !m_sPageText.equals( sPageText ) ) @@ -147,7 +140,6 @@ namespace accessibility } - void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { if ( IsEnabled() ) @@ -230,14 +222,12 @@ namespace accessibility } - sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleTabBarPage" }; @@ -267,7 +257,6 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -279,7 +268,6 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -288,7 +276,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -301,7 +288,6 @@ namespace accessibility } - sal_Int16 AccessibleTabBarPage::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -310,7 +296,6 @@ namespace accessibility } - OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -323,7 +308,6 @@ namespace accessibility } - OUString AccessibleTabBarPage::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -332,7 +316,6 @@ namespace accessibility } - Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -343,7 +326,6 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -364,7 +346,6 @@ namespace accessibility } - Locale AccessibleTabBarPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -384,14 +365,12 @@ namespace accessibility } - void AccessibleTabBarPage::grabFocus( ) throw (RuntimeException, std::exception) { // no focus } - sal_Int32 AccessibleTabBarPage::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -409,7 +388,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPage::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -447,7 +425,6 @@ namespace accessibility } - OUString AccessibleTabBarPage::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -456,7 +433,6 @@ namespace accessibility } - OUString AccessibleTabBarPage::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -465,8 +441,6 @@ namespace accessibility } - - } // namespace accessibility diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index cc0fd4183abf..f512c1ffd028 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -31,7 +31,6 @@ #include <toolkit/helper/convert.hxx> - namespace accessibility { @@ -55,7 +54,6 @@ namespace accessibility } - AccessibleTabBarPageList::~AccessibleTabBarPageList() { } @@ -75,7 +73,6 @@ namespace accessibility } - void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, bool bSelected ) { NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); @@ -93,7 +90,6 @@ namespace accessibility } - void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -115,7 +111,6 @@ namespace accessibility } - void AccessibleTabBarPageList::InsertChild( sal_Int32 i ) { if ( i >= 0 && i <= (sal_Int32)m_aAccessibleChildren.size() ) @@ -135,7 +130,6 @@ namespace accessibility } - void AccessibleTabBarPageList::RemoveChild( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -161,7 +155,6 @@ namespace accessibility } - void AccessibleTabBarPageList::MoveChild( sal_Int32 i, sal_Int32 j ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() && @@ -182,7 +175,6 @@ namespace accessibility } - void AccessibleTabBarPageList::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -309,7 +301,6 @@ namespace accessibility } - void AccessibleTabBarPageList::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { if ( m_pTabBar ) @@ -380,14 +371,12 @@ namespace accessibility } - sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleTabBarPageList" }; @@ -417,7 +406,6 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -443,7 +431,6 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -456,7 +443,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -465,7 +451,6 @@ namespace accessibility } - sal_Int16 AccessibleTabBarPageList::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -474,7 +459,6 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -483,7 +467,6 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -492,7 +475,6 @@ namespace accessibility } - Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -503,7 +485,6 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -524,7 +505,6 @@ namespace accessibility } - Locale AccessibleTabBarPageList::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -564,14 +544,12 @@ namespace accessibility } - void AccessibleTabBarPageList::grabFocus( ) throw (RuntimeException, std::exception) { // no focus } - sal_Int32 AccessibleTabBarPageList::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -589,7 +567,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -627,7 +604,6 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -636,7 +612,6 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -665,7 +640,6 @@ namespace accessibility } - sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -681,14 +655,12 @@ namespace accessibility } - void AccessibleTabBarPageList::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { // This method makes no sense in a TabBar, and so does nothing. } - void AccessibleTabBarPageList::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -697,7 +669,6 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -706,7 +677,6 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -729,7 +699,6 @@ namespace accessibility } - void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -741,8 +710,6 @@ namespace accessibility } - - } // namespace accessibility diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 43dc9fedaeb4..25c5a515fd08 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -31,14 +31,12 @@ using namespace accessibility; SimpleResMgr* TkResMgr::m_pImpl = nullptr; - TkResMgr::EnsureDelete::~EnsureDelete() { delete TkResMgr::m_pImpl; } - void TkResMgr::ensureImplExists() { if (m_pImpl) @@ -54,7 +52,6 @@ void TkResMgr::ensureImplExists() } - OUString TkResMgr::loadString( sal_uInt16 nResId ) { OUString sReturn; @@ -67,5 +64,4 @@ OUString TkResMgr::loadString( sal_uInt16 nResId ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 06aaeb3f99b3..5ef4ccae2398 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // OAccessibleMenuBaseComponent @@ -63,7 +62,6 @@ OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu ) } - OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent() { if ( m_pMenu ) @@ -74,42 +72,36 @@ OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent() } - bool OAccessibleMenuBaseComponent::IsEnabled() { return false; } - bool OAccessibleMenuBaseComponent::IsFocused() { return false; } - bool OAccessibleMenuBaseComponent::IsVisible() { return false; } - bool OAccessibleMenuBaseComponent::IsSelected() { return false; } - bool OAccessibleMenuBaseComponent::IsChecked() { return false; } - void OAccessibleMenuBaseComponent::SetStates() { m_bEnabled = IsEnabled(); @@ -120,7 +112,6 @@ void OAccessibleMenuBaseComponent::SetStates() } - void OAccessibleMenuBaseComponent::SetEnabled( bool bEnabled ) { if ( m_bEnabled != bEnabled ) @@ -148,7 +139,6 @@ void OAccessibleMenuBaseComponent::SetEnabled( bool bEnabled ) } - void OAccessibleMenuBaseComponent::SetFocused( bool bFocused ) { if ( m_bFocused != bFocused ) @@ -164,7 +154,6 @@ void OAccessibleMenuBaseComponent::SetFocused( bool bFocused ) } - void OAccessibleMenuBaseComponent::SetVisible( bool bVisible ) { if ( m_bVisible != bVisible ) @@ -180,7 +169,6 @@ void OAccessibleMenuBaseComponent::SetVisible( bool bVisible ) } - void OAccessibleMenuBaseComponent::SetSelected( bool bSelected ) { if ( m_bSelected != bSelected ) @@ -196,7 +184,6 @@ void OAccessibleMenuBaseComponent::SetSelected( bool bSelected ) } - void OAccessibleMenuBaseComponent::SetChecked( bool bChecked ) { if ( m_bChecked != bChecked ) @@ -212,7 +199,6 @@ void OAccessibleMenuBaseComponent::SetChecked( bool bChecked ) } - void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, bool bEnabled ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -228,7 +214,6 @@ void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, bool bEnabled ) } - void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, bool bFocused ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -244,7 +229,6 @@ void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, bool bFocused ) } - void OAccessibleMenuBaseComponent::UpdateVisible() { SetVisible( IsVisible() ); @@ -261,7 +245,6 @@ void OAccessibleMenuBaseComponent::UpdateVisible() } - void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, bool bSelected ) { NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); @@ -279,7 +262,6 @@ void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, bool bSelected ) } - void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, bool bChecked ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -295,7 +277,6 @@ void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, bool bChecked ) } - void OAccessibleMenuBaseComponent::UpdateAccessibleName( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -311,7 +292,6 @@ void OAccessibleMenuBaseComponent::UpdateAccessibleName( sal_Int32 i ) } - void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -327,14 +307,12 @@ void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i ) } - sal_Int32 OAccessibleMenuBaseComponent::GetChildCount() { return m_aAccessibleChildren.size(); } - Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i ) { Reference< XAccessible > xChild = m_aAccessibleChildren[i]; @@ -377,7 +355,6 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i ) } - Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Point& rPoint ) { Reference< XAccessible > xChild; @@ -404,7 +381,6 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po } - void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i ) { if ( i > (sal_Int32)m_aAccessibleChildren.size() ) @@ -439,7 +415,6 @@ void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i ) } - void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -477,14 +452,12 @@ void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i ) } - bool OAccessibleMenuBaseComponent::IsHighlighted() { return false; } - bool OAccessibleMenuBaseComponent::IsChildHighlighted() { bool bChildHighlighted = false; @@ -507,7 +480,6 @@ bool OAccessibleMenuBaseComponent::IsChildHighlighted() } - void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i ) { // open the menu @@ -520,7 +492,6 @@ void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i ) } - void OAccessibleMenuBaseComponent::DeSelectAll() { if ( m_pMenu ) @@ -528,7 +499,6 @@ void OAccessibleMenuBaseComponent::DeSelectAll() } - bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) { bool bSelected = false; @@ -540,32 +510,27 @@ bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) } - void OAccessibleMenuBaseComponent::Select() { } - void OAccessibleMenuBaseComponent::DeSelect() { } - void OAccessibleMenuBaseComponent::Click() { } - bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() { return false; } - IMPL_LINK_TYPED( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetMenu(), "OAccessibleMenuBaseComponent - Menu?" ); @@ -573,7 +538,6 @@ IMPL_LINK_TYPED( OAccessibleMenuBaseComponent, MenuEventListener, VclMenuEvent&, } - void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent ) { sal_uInt16 nItemPos = rVclMenuEvent.GetItemPos(); @@ -762,7 +726,6 @@ Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStat } - bool OAccessibleMenuBaseComponent::IsMenuHideDisabledEntries() { return false; diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 63626fa28740..16fe428bd6bc 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; - // class OAccessibleMenuComponent @@ -53,20 +52,17 @@ OAccessibleMenuComponent::OAccessibleMenuComponent( Menu* pMenu ) } - OAccessibleMenuComponent::~OAccessibleMenuComponent() { } - bool OAccessibleMenuComponent::IsEnabled() { return true; } - bool OAccessibleMenuComponent::IsVisible() { bool bVisible = false; @@ -78,7 +74,6 @@ bool OAccessibleMenuComponent::IsVisible() } - void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { if ( IsEnabled() ) @@ -162,7 +157,6 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce } - Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -174,7 +168,6 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 } - Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -196,7 +189,6 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw } - sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -205,7 +197,6 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeExceptio } - OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -222,7 +213,6 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc } - OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -231,7 +221,6 @@ OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException } - Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -242,7 +231,6 @@ Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelat } - Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -262,7 +250,6 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const a } - awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -283,7 +270,6 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeExcep } - void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -297,7 +283,6 @@ void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException, std::excep } - sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -309,7 +294,6 @@ sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException, s } - sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -347,7 +331,6 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeExce } - OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -356,7 +339,6 @@ OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeExcepti } - OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -379,7 +361,6 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th } - sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -391,7 +372,6 @@ sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIn } - void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -400,14 +380,12 @@ void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeExcept } - void OAccessibleMenuComponent::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { // This method makes no sense in a menu, and so does nothing. } - sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -424,7 +402,6 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (R } - Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -447,7 +424,6 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s } - void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -459,5 +435,4 @@ void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index f2e1c78712b9..37f8da2b36aa 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; - // class OAccessibleMenuItemComponent @@ -65,13 +64,11 @@ OAccessibleMenuItemComponent::OAccessibleMenuItemComponent( Menu* pParent, sal_u } - OAccessibleMenuItemComponent::~OAccessibleMenuItemComponent() { } - bool OAccessibleMenuItemComponent::IsEnabled() { OExternalLockGuard aGuard( this ); @@ -84,7 +81,6 @@ bool OAccessibleMenuItemComponent::IsEnabled() } - bool OAccessibleMenuItemComponent::IsVisible() { bool bVisible = false; @@ -96,7 +92,6 @@ bool OAccessibleMenuItemComponent::IsVisible() } - void OAccessibleMenuItemComponent::Select() { // open the parent menu @@ -114,7 +109,6 @@ void OAccessibleMenuItemComponent::Select() } - void OAccessibleMenuItemComponent::DeSelect() { if ( m_pParent && IsSelected() ) @@ -122,7 +116,6 @@ void OAccessibleMenuItemComponent::DeSelect() } - void OAccessibleMenuItemComponent::Click() { // open the parent menu @@ -170,14 +163,12 @@ void OAccessibleMenuItemComponent::Click() } - void OAccessibleMenuItemComponent::SetItemPos( sal_uInt16 nItemPos ) { m_nItemPos = nItemPos; } - void OAccessibleMenuItemComponent::SetAccessibleName( const OUString& sAccessibleName ) { if ( !m_sAccessibleName.equals( sAccessibleName ) ) @@ -191,7 +182,6 @@ void OAccessibleMenuItemComponent::SetAccessibleName( const OUString& sAccessibl } - OUString OAccessibleMenuItemComponent::GetAccessibleName() { OUString sName; @@ -212,7 +202,6 @@ OUString OAccessibleMenuItemComponent::GetAccessibleName() } - void OAccessibleMenuItemComponent::SetItemText( const OUString& sItemText ) { Any aOldValue, aNewValue; @@ -224,7 +213,6 @@ void OAccessibleMenuItemComponent::SetItemText( const OUString& sItemText ) } - OUString OAccessibleMenuItemComponent::GetItemText() { OUString sText; @@ -235,7 +223,6 @@ OUString OAccessibleMenuItemComponent::GetItemText() } - void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { bool bEnabled = IsEnabled(); @@ -319,7 +306,6 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (Runtime } - Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -331,7 +317,6 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_I } - Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -340,7 +325,6 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) t } - sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -349,7 +333,6 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (Ru } - sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -358,7 +341,6 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeExce } - OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -371,7 +353,6 @@ OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (Runtim } - OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -380,7 +361,6 @@ OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeExcep } - Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -391,7 +371,6 @@ Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleR } - Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -411,14 +390,12 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( con } - void OAccessibleMenuItemComponent::grabFocus( ) throw (RuntimeException, std::exception) { // no focus for items } - sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -436,7 +413,6 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeExceptio } - sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -474,7 +450,6 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (Runtime } - OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -483,7 +458,6 @@ OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeExc } - OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -496,7 +470,6 @@ OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeExceptio } - bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries() { if (m_pParent ) diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 62c8a1804f66..66da4236b020 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // VCLXAccessibleButton @@ -49,13 +48,11 @@ VCLXAccessibleButton::VCLXAccessibleButton( VCLXWindow* pVCLWindow ) } - VCLXAccessibleButton::~VCLXAccessibleButton() { } - void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -80,7 +77,6 @@ void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowE } - void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); @@ -130,7 +126,6 @@ OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException, } - Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleButton" }; @@ -187,7 +182,6 @@ sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeExcept } - sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -203,7 +197,6 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (In } - OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -215,7 +208,6 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex } - Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -271,7 +263,6 @@ Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException, std::exce } - sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -297,7 +288,6 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt } - Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -309,7 +299,6 @@ Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException, std::exce } - Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -321,5 +310,4 @@ Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException, std::exce } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index bc77d1cf4227..c54e064d94b5 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // VCLXAccessibleCheckBox @@ -53,13 +52,11 @@ VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow ) } - VCLXAccessibleCheckBox::~VCLXAccessibleCheckBox() { } - bool VCLXAccessibleCheckBox::IsChecked() { bool bChecked = false; @@ -72,7 +69,6 @@ bool VCLXAccessibleCheckBox::IsChecked() } - bool VCLXAccessibleCheckBox::IsIndeterminate() { bool bIndeterminate = false; @@ -85,7 +81,6 @@ bool VCLXAccessibleCheckBox::IsIndeterminate() } - void VCLXAccessibleCheckBox::SetChecked( bool bChecked ) { if ( m_bChecked != bChecked ) @@ -101,7 +96,6 @@ void VCLXAccessibleCheckBox::SetChecked( bool bChecked ) } - void VCLXAccessibleCheckBox::SetIndeterminate( bool bIndeterminate ) { if ( m_bIndeterminate != bIndeterminate ) @@ -117,7 +111,6 @@ void VCLXAccessibleCheckBox::SetIndeterminate( bool bIndeterminate ) } - void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -134,7 +127,6 @@ void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindo } - void VCLXAccessibleCheckBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); @@ -170,7 +162,6 @@ OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException } - Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleCheckBox" }; @@ -189,7 +180,6 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce } - sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -221,7 +211,6 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw ( } - OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -236,7 +225,6 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd } - Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -292,7 +280,6 @@ Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException, std::ex } - sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -320,7 +307,6 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru } - Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -337,7 +323,6 @@ Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException, std::ex } - Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -349,5 +334,4 @@ Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException, std::ex } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index b030a1d3f0ec..1da4234a4f6b 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -37,8 +37,6 @@ VCLXAccessibleComboBox::VCLXAccessibleComboBox (VCLXWindow* pVCLWindow) } - - VCLXAccessibleComboBox::~VCLXAccessibleComboBox() { } @@ -54,7 +52,6 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo } - // XServiceInfo OUString VCLXAccessibleComboBox::getImplementationName() @@ -64,8 +61,6 @@ OUString VCLXAccessibleComboBox::getImplementationName() } - - Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index cb58fddfd145..54c245cbb6ba 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -51,8 +51,6 @@ VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCL } - - VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox() { } @@ -78,8 +76,6 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r } - - // XServiceInfo OUString VCLXAccessibleDropDownComboBox::getImplementationName() @@ -89,8 +85,6 @@ OUString VCLXAccessibleDropDownComboBox::getImplementationName() } - - Sequence< OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 2a563cef5ebc..67d060f46806 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -50,8 +50,6 @@ VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWi } - - VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox() { } @@ -67,8 +65,6 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rV } - - // XServiceInfo OUString VCLXAccessibleDropDownListBox::getImplementationName() @@ -78,8 +74,6 @@ OUString VCLXAccessibleDropDownListBox::getImplementationName() } - - Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 26d1381caa7a..9ef00251c6ad 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // VCLXAccessibleEdit @@ -61,13 +60,11 @@ VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow ) } - VCLXAccessibleEdit::~VCLXAccessibleEdit() { } - void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -110,7 +107,6 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve } - void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); @@ -153,7 +149,6 @@ OUString VCLXAccessibleEdit::implGetText() } - void VCLXAccessibleEdit::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { awt::Selection aSelection; @@ -187,7 +182,6 @@ OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException, st } - Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleEdit" }; @@ -206,7 +200,6 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException, } - Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -218,7 +211,6 @@ Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) t } - sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -246,7 +238,6 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeExceptio } - sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -266,7 +257,6 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde } - OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -278,7 +268,6 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) } - Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -299,14 +288,12 @@ sal_Int32 VCLXAccessibleEdit::getCaretPosition( ) throw (RuntimeException, std: } - sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return setSelection( nIndex, nIndex ); } - sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -315,7 +302,6 @@ sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOut } - Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -324,7 +310,6 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 } - awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -367,7 +352,6 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw } - sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -376,7 +360,6 @@ sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException, std } - sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -385,7 +368,6 @@ sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw } - OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -394,7 +376,6 @@ OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException, std::e } - sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -403,7 +384,6 @@ sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException, std } - sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -412,7 +392,6 @@ sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException, std:: } - sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -435,7 +414,6 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd } - OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -444,7 +422,6 @@ OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException, std::exception } - OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -453,7 +430,6 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd } - css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -462,7 +438,6 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nI } - css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -471,7 +446,6 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int3 } - css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -480,7 +454,6 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int3 } - sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -500,7 +473,6 @@ sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex } - sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -536,7 +508,6 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun } - sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -545,7 +516,6 @@ sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIn } - sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -554,7 +524,6 @@ sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex } - sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -581,7 +550,6 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI } - sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence<PropertyValue>& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -593,7 +561,6 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn } - sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -611,5 +578,4 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeExce } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 8b7c42e70ac8..d61ab0f43a5d 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -31,20 +31,17 @@ VCLXAccessibleFixedHyperlink::VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLWind } - VCLXAccessibleFixedHyperlink::~VCLXAccessibleFixedHyperlink() { } - void VCLXAccessibleFixedHyperlink::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); } - void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { // TODO @@ -61,7 +58,6 @@ OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::Runti } - uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNames { "com.sun.star.awt.AccessibleFixedHyperlink" }; @@ -69,5 +65,4 @@ uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index 74d3db4c4eb9..b6645b356aff 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; - // VCLXAccessibleFixedText @@ -40,13 +39,11 @@ VCLXAccessibleFixedText::VCLXAccessibleFixedText( VCLXWindow* pVCLWindow ) } - VCLXAccessibleFixedText::~VCLXAccessibleFixedText() { } - void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); @@ -56,7 +53,6 @@ void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHel } - void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { // TODO @@ -73,7 +69,6 @@ OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeExceptio } - Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleFixedText" }; @@ -81,5 +76,4 @@ Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw ( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 54736a58f6e2..c425f3c204d5 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -494,7 +494,6 @@ void VCLXAccessibleList::UpdateSelection (const OUString& sTextOfSelectedItem) } - Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 nPos) { Reference<XAccessible> xChild; @@ -965,14 +964,12 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeExcept } - bool VCLXAccessibleList::IsInDropDown() { return m_pListBoxHelper->IsInDropDown(); } - void VCLXAccessibleList::HandleDropOpen() { if ( !m_bDisableProcessEvent ) diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index c50b9e0822a9..0db8a0671670 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -48,8 +48,6 @@ VCLXAccessibleListBox::VCLXAccessibleListBox (VCLXWindow* pVCLWindow) } - - VCLXAccessibleListBox::~VCLXAccessibleListBox() { } @@ -73,8 +71,6 @@ OUString VCLXAccessibleListBox::getImplementationName() } - - Sequence< OUString > VCLXAccessibleListBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index cfef2e4e3860..2ce3c9110d2f 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -624,8 +624,6 @@ void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Refer } - - // AF (Oct. 29 2002): Return black as constant foreground color. This is an // initial implementation and has to be substituted by code that determines // the color that is actually used. diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index bd51d096b55c..a251fdd21b63 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // VCLXAccessibleMenu @@ -40,13 +39,11 @@ VCLXAccessibleMenu::VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu } - VCLXAccessibleMenu::~VCLXAccessibleMenu() { } - bool VCLXAccessibleMenu::IsFocused() { bool bFocused = false; @@ -58,7 +55,6 @@ bool VCLXAccessibleMenu::IsFocused() } - bool VCLXAccessibleMenu::IsPopupMenuOpen() { bool bPopupMenuOpen = false; @@ -95,7 +91,6 @@ OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException, st } - Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleMenu" }; @@ -114,7 +109,6 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeExceptio } - Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -126,7 +120,6 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) t } - sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -160,7 +153,6 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I } - sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -172,7 +164,6 @@ sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) } - void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -181,14 +172,12 @@ void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException, s } - void VCLXAccessibleMenu::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { // This method makes no sense in a menu, and so does nothing. } - sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -205,7 +194,6 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (Runtime } - Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -228,7 +216,6 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int } - void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -240,7 +227,6 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw } - OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 10340f79ad86..17b3cb46d9b7 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; - // class VCLXAccessibleMenuBar @@ -52,7 +51,6 @@ VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu ) } - VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar() { if ( m_pWindow ) @@ -60,7 +58,6 @@ VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar() } - bool VCLXAccessibleMenuBar::IsFocused() { bool bFocused = false; @@ -72,7 +69,6 @@ bool VCLXAccessibleMenuBar::IsFocused() } - IMPL_LINK_TYPED( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" ); @@ -83,7 +79,6 @@ IMPL_LINK_TYPED( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rE } - void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -135,7 +130,6 @@ OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException, } - Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleMenuBar" }; @@ -177,7 +171,6 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeEx } - sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -197,5 +190,4 @@ sal_Int32 VCLXAccessibleMenuBar::getBackground( ) throw (RuntimeException, std: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index a13a9f20b2e3..074fb357a05d 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; - // class VCLXAccessibleMenuItem @@ -55,27 +54,23 @@ VCLXAccessibleMenuItem::VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemP } - VCLXAccessibleMenuItem::~VCLXAccessibleMenuItem() { } - bool VCLXAccessibleMenuItem::IsFocused() { return IsHighlighted(); } - bool VCLXAccessibleMenuItem::IsSelected() { return IsHighlighted(); } - bool VCLXAccessibleMenuItem::IsChecked() { bool bChecked = false; @@ -91,7 +86,6 @@ bool VCLXAccessibleMenuItem::IsChecked() } - bool VCLXAccessibleMenuItem::IsHighlighted() { bool bHighlighted = false; @@ -103,7 +97,6 @@ bool VCLXAccessibleMenuItem::IsHighlighted() } - void VCLXAccessibleMenuItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { OAccessibleMenuItemComponent::FillAccessibleStateSet( rStateSet ); @@ -132,14 +125,12 @@ OUString VCLXAccessibleMenuItem::implGetText() } - Locale VCLXAccessibleMenuItem::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } - void VCLXAccessibleMenuItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { nStartIndex = 0; @@ -168,7 +159,6 @@ OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException } - Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleMenuItem" }; @@ -209,7 +199,6 @@ sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException, st } - sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { @@ -222,7 +211,6 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind } - sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -231,7 +219,6 @@ sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (Inde } - Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -249,7 +236,6 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In } - awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -271,7 +257,6 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) th } - sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -280,7 +265,6 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException, s } - sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -301,7 +285,6 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th } - OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -310,7 +293,6 @@ OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException, std: } - sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -319,7 +301,6 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException, s } - sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -328,7 +309,6 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException, std } - sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -340,7 +320,6 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 } - OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -349,7 +328,6 @@ OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException, std::excepti } - OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -358,7 +336,6 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 } - css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -367,7 +344,6 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int3 } - css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -376,7 +352,6 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_ } - css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -385,7 +360,6 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_ } - sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -430,7 +404,6 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce } - sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -444,7 +417,6 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw ( } - OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -456,7 +428,6 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd } - Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -550,7 +521,6 @@ Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException, std::ex } - sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -574,7 +544,6 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru } - Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -586,7 +555,6 @@ Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException, std::ex } - Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -598,5 +566,4 @@ Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException, std::ex } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index 0ceda9f1bcb5..8c58c3fc285a 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; - // class VCLXAccessibleMenuSeparator @@ -38,7 +37,6 @@ VCLXAccessibleMenuSeparator::VCLXAccessibleMenuSeparator( Menu* pParent, sal_uIn } - VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator() { } @@ -53,7 +51,6 @@ OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeExce } - Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleMenuSeparator" }; @@ -72,5 +69,4 @@ sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) throw (RuntimeExcep } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index ee97f1b96d91..6d48f189b9ce 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; using namespace ::comphelper; - // class VCLXAccessiblePopupMenu @@ -38,13 +37,11 @@ VCLXAccessiblePopupMenu::VCLXAccessiblePopupMenu( Menu* pMenu ) } - VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu() { } - bool VCLXAccessiblePopupMenu::IsFocused() { return !IsChildHighlighted(); @@ -60,7 +57,6 @@ OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeExceptio } - Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessiblePopupMenu" }; @@ -79,7 +75,6 @@ sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (Runtime } - sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -99,5 +94,4 @@ sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) throw (RuntimeException, st } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index de870fc4a062..d9ad6f09e52e 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // VCLXAccessibleRadioButton @@ -54,13 +53,11 @@ VCLXAccessibleRadioButton::VCLXAccessibleRadioButton( VCLXWindow* pVCLWindow ) } - VCLXAccessibleRadioButton::~VCLXAccessibleRadioButton() { } - void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -85,7 +82,6 @@ void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWi } - void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) { VCLXAccessibleTextComponent::FillAccessibleRelationSet( rRelationSet ); @@ -109,7 +105,6 @@ void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelati } - void VCLXAccessibleRadioButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); @@ -145,7 +140,6 @@ OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeExcept } - Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleRadioButton" }; @@ -164,7 +158,6 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE } - sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -180,7 +173,6 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) thro } - OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -192,7 +184,6 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n } - Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -248,7 +239,6 @@ Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException, std: } - sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -274,7 +264,6 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw } - Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -286,7 +275,6 @@ Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException, std: } - Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -298,5 +286,4 @@ Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException, std: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 91b528cb3d4e..f3675f7a57db 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -49,13 +49,11 @@ VCLXAccessibleScrollBar::VCLXAccessibleScrollBar( VCLXWindow* pVCLWindow ) } - VCLXAccessibleScrollBar::~VCLXAccessibleScrollBar() { } - void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -71,7 +69,6 @@ void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } - void VCLXAccessibleScrollBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); @@ -110,7 +107,6 @@ OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeExceptio } - Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleScrollBar" }; @@ -129,7 +125,6 @@ sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeExc } - sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -158,7 +153,6 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw } - OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -181,7 +175,6 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn } - Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -210,7 +203,6 @@ Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException, std::e } - sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -238,7 +230,6 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R } - Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -253,7 +244,6 @@ Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException, std::e } - Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -265,7 +255,6 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException, std::e } - OUString VCLXAccessibleScrollBar::getAccessibleName( ) throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index a2e4053c8b70..1ef43c54e266 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // class VCLXAccessibleStatusBar @@ -45,13 +44,11 @@ VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow ) } - VCLXAccessibleStatusBar::~VCLXAccessibleStatusBar() { } - void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, bool bShowing ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -67,7 +64,6 @@ void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, bool bShowing ) } - void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -86,7 +82,6 @@ void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i ) } - void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -105,7 +100,6 @@ void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i ) } - void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i ) { if ( i >= 0 && i <= (sal_Int32)m_aAccessibleChildren.size() ) @@ -125,7 +119,6 @@ void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i ) } - void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -151,7 +144,6 @@ void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i ) } - void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -287,7 +279,6 @@ OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeExceptio } - Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleStatusBar" }; @@ -306,7 +297,6 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep } - Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -352,5 +342,4 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const aw } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 262da8c1cb15..0f4c1b1f5eef 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; - // class VCLXAccessibleStatusBarItem @@ -61,7 +60,6 @@ VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, } - VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem() { delete m_pExternalLock; @@ -69,7 +67,6 @@ VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem() } - bool VCLXAccessibleStatusBarItem::IsShowing() { bool bShowing = false; @@ -81,7 +78,6 @@ bool VCLXAccessibleStatusBarItem::IsShowing() } - void VCLXAccessibleStatusBarItem::SetShowing( bool bShowing ) { if ( m_bShowing != bShowing ) @@ -97,7 +93,6 @@ void VCLXAccessibleStatusBarItem::SetShowing( bool bShowing ) } - void VCLXAccessibleStatusBarItem::SetItemName( const OUString& sItemName ) { if ( !m_sItemName.equals( sItemName ) ) @@ -111,7 +106,6 @@ void VCLXAccessibleStatusBarItem::SetItemName( const OUString& sItemName ) } - OUString VCLXAccessibleStatusBarItem::GetItemName() { OUString sName; @@ -122,7 +116,6 @@ OUString VCLXAccessibleStatusBarItem::GetItemName() } - void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText ) { Any aOldValue, aNewValue; @@ -134,7 +127,6 @@ void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText ) } - OUString VCLXAccessibleStatusBarItem::GetItemText() { OUString sText; @@ -150,7 +142,6 @@ OUString VCLXAccessibleStatusBarItem::GetItemText() } - void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { rStateSet.AddState( AccessibleStateType::ENABLED ); @@ -186,14 +177,12 @@ OUString VCLXAccessibleStatusBarItem::implGetText() } - lang::Locale VCLXAccessibleStatusBarItem::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } - void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { nStartIndex = 0; @@ -235,14 +224,12 @@ OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeExce } - sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleStatusBarItem" }; @@ -272,7 +259,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeE } - Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -284,7 +270,6 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_In } - Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -297,7 +282,6 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) th } - sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -310,7 +294,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (Run } - sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -319,7 +302,6 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeExcep } - OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -332,7 +314,6 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (Runtim } - OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -341,7 +322,6 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeExcept } - Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -352,7 +332,6 @@ Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRe } - Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -373,7 +352,6 @@ Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleState } - Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -393,14 +371,12 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( cons } - void VCLXAccessibleStatusBarItem::grabFocus( ) throw (RuntimeException, std::exception) { // no focus for status bar items } - sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -418,7 +394,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeExceptio } - sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -456,7 +431,6 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeE } - OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -465,7 +439,6 @@ OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeExce } - OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -485,7 +458,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeExceptio } - sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -497,7 +469,6 @@ sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw } - Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -521,7 +492,6 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s } - awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -544,7 +514,6 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex } - sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -564,7 +533,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint } - sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -576,7 +544,6 @@ sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_I } - sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -607,5 +574,4 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index 2e7c7aeb9f91..c65688efa2d3 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // class VCLXAccessibleTabControl @@ -50,13 +49,11 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow ) } - VCLXAccessibleTabControl::~VCLXAccessibleTabControl() { } - void VCLXAccessibleTabControl::UpdateFocused() { for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i ) @@ -72,7 +69,6 @@ void VCLXAccessibleTabControl::UpdateFocused() } - void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -88,7 +84,6 @@ void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected ) } - void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -104,7 +99,6 @@ void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i ) } - void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -120,7 +114,6 @@ void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew ) } - void VCLXAccessibleTabControl::InsertChild( sal_Int32 i ) { if ( i >= 0 && i <= (sal_Int32)m_aAccessibleChildren.size() ) @@ -140,7 +133,6 @@ void VCLXAccessibleTabControl::InsertChild( sal_Int32 i ) } - void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) @@ -166,7 +158,6 @@ void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i ) } - void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -261,7 +252,6 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin } - void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -291,8 +281,6 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV } - - void VCLXAccessibleTabControl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); @@ -346,7 +334,6 @@ OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeExcepti } - Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleTabControl" }; @@ -365,7 +352,6 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce } - Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -390,7 +376,6 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 } - sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -399,7 +384,6 @@ sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeExceptio } - OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -423,7 +407,6 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th } - sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -439,14 +422,12 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn } - void VCLXAccessibleTabControl::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { // This method makes no sense in a tab control, and so does nothing. } - void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -455,7 +436,6 @@ void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeExc } - sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -464,7 +444,6 @@ sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (R } - Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -487,7 +466,6 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s } - void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -499,5 +477,4 @@ void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 8b5b5e702232..bb70bdf77880 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace ::comphelper; - // class VCLXAccessibleTabPage @@ -60,7 +59,6 @@ VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt1 } - VCLXAccessibleTabPage::~VCLXAccessibleTabPage() { delete m_pExternalLock; @@ -68,7 +66,6 @@ VCLXAccessibleTabPage::~VCLXAccessibleTabPage() } - bool VCLXAccessibleTabPage::IsFocused() { bool bFocused = false; @@ -80,7 +77,6 @@ bool VCLXAccessibleTabPage::IsFocused() } - bool VCLXAccessibleTabPage::IsSelected() { bool bSelected = false; @@ -92,7 +88,6 @@ bool VCLXAccessibleTabPage::IsSelected() } - void VCLXAccessibleTabPage::SetFocused( bool bFocused ) { if ( m_bFocused != bFocused ) @@ -108,7 +103,6 @@ void VCLXAccessibleTabPage::SetFocused( bool bFocused ) } - void VCLXAccessibleTabPage::SetSelected( bool bSelected ) { if ( m_bSelected != bSelected ) @@ -124,7 +118,6 @@ void VCLXAccessibleTabPage::SetSelected( bool bSelected ) } - void VCLXAccessibleTabPage::SetPageText( const OUString& sPageText ) { Any aOldValue, aNewValue; @@ -140,7 +133,6 @@ void VCLXAccessibleTabPage::SetPageText( const OUString& sPageText ) } - OUString VCLXAccessibleTabPage::GetPageText() { OUString sText; @@ -151,7 +143,6 @@ OUString VCLXAccessibleTabPage::GetPageText() } - void VCLXAccessibleTabPage::Update( bool bNew ) { if ( m_pTabControl ) @@ -174,7 +165,6 @@ void VCLXAccessibleTabPage::Update( bool bNew ) } - void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { rStateSet.AddState( AccessibleStateType::ENABLED ); @@ -219,14 +209,12 @@ OUString VCLXAccessibleTabPage::implGetText() } - lang::Locale VCLXAccessibleTabPage::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } - void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { nStartIndex = 0; @@ -267,14 +255,12 @@ OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException, } - sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "com.sun.star.awt.AccessibleTabPage" }; @@ -312,7 +298,6 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeExcepti } - Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -332,7 +317,6 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i } - Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -345,7 +329,6 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (R } - sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -358,7 +341,6 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeEx } - sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -367,7 +349,6 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException, } - OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -380,7 +361,6 @@ OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeExc } - OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -389,7 +369,6 @@ OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException, s } - Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -400,7 +379,6 @@ Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelation } - Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -421,7 +399,6 @@ Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( } - Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -461,7 +438,6 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt: } - void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -474,7 +450,6 @@ void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException, std::exceptio } - sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -492,7 +467,6 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException, std:: } - sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -530,7 +504,6 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeExcepti } - OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -539,7 +512,6 @@ OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException, } - OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -559,7 +531,6 @@ sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException, std } - sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -571,7 +542,6 @@ sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (Inde } - Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -595,7 +565,6 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int } - awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -616,7 +585,6 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) thr } - sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -637,7 +605,6 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) thr } - sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -649,7 +616,6 @@ sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 n } - sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -680,5 +646,4 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index bf6f51100bf7..430b4a4937cf 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // class VCLXAccessibleTabPageWindow @@ -59,7 +58,6 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo } - VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow() { } @@ -130,7 +128,6 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) th } - sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -139,5 +136,4 @@ sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (Run } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index f39446077de2..159898b7e48b 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // class VCLXAccessibleTextComponent @@ -55,13 +54,11 @@ VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindo } - VCLXAccessibleTextComponent::~VCLXAccessibleTextComponent() { } - void VCLXAccessibleTextComponent::SetText( const OUString& sText ) { Any aOldValue, aNewValue; @@ -73,7 +70,6 @@ void VCLXAccessibleTextComponent::SetText( const OUString& sText ) } - void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -103,14 +99,12 @@ OUString VCLXAccessibleTextComponent::implGetText() } - lang::Locale VCLXAccessibleTextComponent::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } - void VCLXAccessibleTextComponent::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { nStartIndex = 0; @@ -152,7 +146,6 @@ sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeExceptio } - sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -161,7 +154,6 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw } - sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -170,7 +162,6 @@ sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw } - Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -245,7 +236,6 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s } - awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -262,7 +252,6 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex } - sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -271,7 +260,6 @@ sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeExcepti } - sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -285,7 +273,6 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint } - OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -294,7 +281,6 @@ OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException, } - sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -303,7 +289,6 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti } - sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -312,7 +297,6 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException } - sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -324,7 +308,6 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I } - OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -333,7 +316,6 @@ OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException, std::ex } - OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -342,7 +324,6 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I } - css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -351,7 +332,6 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal } - css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -360,7 +340,6 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( } - css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -369,7 +348,6 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( } - sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -400,5 +378,4 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index 4eb05d3ecb50..71c647e77da0 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; - - VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const Reference< XAccessible >& _xParent) : VCLXAccessibleTextComponent (pVCLWindow), @@ -47,8 +45,6 @@ VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const } - - VCLXAccessibleTextField::~VCLXAccessibleTextField() { } @@ -86,8 +82,6 @@ sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount() } - - Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal_Int32) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { @@ -95,8 +89,6 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal } - - sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole() throw (RuntimeException, std::exception) { @@ -114,7 +106,6 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent( } - // XServiceInfo OUString VCLXAccessibleTextField::getImplementationName() @@ -124,8 +115,6 @@ OUString VCLXAccessibleTextField::getImplementationName() } - - Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames() throw (RuntimeException, std::exception) { diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index e3d77e8e2076..8a2ec252eee0 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -707,5 +707,4 @@ Any VCLXAccessibleToolBoxItem::getMinimumValue( ) throw (RuntimeException, std: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index ab1bf53575b7..cefbb894eff3 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -100,11 +100,9 @@ namespace animcore { - typedef ::std::list< Reference< XAnimationNode > > ChildList_t; - class AnimationNodeBase : public XAnimateMotion, public XAnimateColor, public XTransitionFilter, @@ -350,7 +348,6 @@ private: }; - class TimeContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { public: @@ -402,7 +399,6 @@ Any SAL_CALL TimeContainerEnumeration::nextElement() } - Sequence< Type >* AnimationNode::mpTypes[] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }; AnimationNode::AnimationNode( sal_Int16 nNodeType ) @@ -723,7 +719,6 @@ Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeEx } - void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw() { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -800,7 +795,6 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw() } - Sequence< Type > AnimationNode::getTypes() throw (RuntimeException, std::exception) { if (! mpTypes[mnNodeType]) @@ -815,7 +809,6 @@ Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeExceptio } - // XInterface void SAL_CALL AnimationNode::acquire( ) throw () { @@ -823,7 +816,6 @@ void SAL_CALL AnimationNode::acquire( ) throw () } - // XInterface void SAL_CALL AnimationNode::release( ) throw () { @@ -831,7 +823,6 @@ void SAL_CALL AnimationNode::release( ) throw () } - // XServiceInfo OUString AnimationNode::getImplementationName() throw(std::exception) { @@ -901,7 +892,6 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames() throw(std::except } - // XAnimationNode sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException, std::exception) { @@ -910,7 +900,6 @@ sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException, std::except } - // XAnimationNode Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException, std::exception) { @@ -919,7 +908,6 @@ Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException, std::exception) } - // XAnimationNode void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception) { @@ -932,7 +920,6 @@ void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeExcepti } - // XAnimationNode Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException, std::exception) { @@ -941,7 +928,6 @@ Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException, std::exceptio } - // XAnimationNode void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception) { @@ -954,7 +940,6 @@ void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeE } - // XAnimationNode Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException, std::exception) { @@ -963,7 +948,6 @@ Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException, std::exception) } - // XAnimationNode void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception) { @@ -976,7 +960,6 @@ void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException, } - // XAnimationNode Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException, std::exception) { @@ -985,7 +968,6 @@ Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException, std::exception } - // XAnimationNode void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) { @@ -998,7 +980,6 @@ void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeExc } - // XAnimationNode Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException, std::exception) { @@ -1007,7 +988,6 @@ Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException, std::excep } - // XAnimationNode void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) { @@ -1020,7 +1000,6 @@ void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (Ru } - // XAnimationNode Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException, std::exception) { @@ -1029,7 +1008,6 @@ Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException, std::ex } - // XAnimationNode void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) { @@ -1042,7 +1020,6 @@ void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) thr } - // XAnimationNode sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException, std::exception) { @@ -1051,7 +1028,6 @@ sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException, std::except } - // XAnimationNode void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) { @@ -1064,7 +1040,6 @@ void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, } - // XAnimationNode sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException, std::exception) { @@ -1073,7 +1048,6 @@ sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException, std: } - // XAnimationNode void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) { @@ -1086,7 +1060,6 @@ void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (Run } - // XAnimationNode sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException, std::exception) { @@ -1095,7 +1068,6 @@ sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException, std::exc } - // XAnimationNode void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) { @@ -1108,7 +1080,6 @@ void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeExce } - // XAnimationNode sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException, std::exception) { @@ -1117,7 +1088,6 @@ sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException, s } - // XAnimationNode void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) { @@ -1130,7 +1100,6 @@ void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) thro } - // XAnimationNode double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException, std::exception) { @@ -1139,7 +1108,6 @@ double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException, std::e } - // XAnimationNode void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) { @@ -1152,7 +1120,6 @@ void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (Runt } - // XAnimationNode double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException, std::exception) { @@ -1161,7 +1128,6 @@ double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException, std::exc } - // XAnimationNode void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) { @@ -1174,7 +1140,6 @@ void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeE } - // XAnimationNode sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std::exception) { @@ -1183,7 +1148,6 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std:: } - // XAnimationNode void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) { @@ -1196,7 +1160,6 @@ void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (Runt } - Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1204,7 +1167,6 @@ Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeExcep } - void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1213,7 +1175,6 @@ void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdat } - // XChild Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException, std::exception) { @@ -1222,7 +1183,6 @@ Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeExcept } - // XChild void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) { @@ -1241,7 +1201,6 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) } - // XCloneable Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException, std::exception) { @@ -1285,7 +1244,6 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeExce } - // XAnimate Any SAL_CALL AnimationNode::getTarget() throw (RuntimeException, std::exception) @@ -1295,7 +1253,6 @@ Any SAL_CALL AnimationNode::getTarget() } - // XAnimate void SAL_CALL AnimationNode::setTarget( const Any& _target ) throw (RuntimeException, std::exception) @@ -1309,7 +1266,6 @@ void SAL_CALL AnimationNode::setTarget( const Any& _target ) } - // XAnimate OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException, std::exception) { @@ -1318,7 +1274,6 @@ OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException, std } - // XAnimate void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute ) throw (RuntimeException, std::exception) @@ -1332,7 +1287,6 @@ void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute ) } - // XAnimate Sequence< Any > SAL_CALL AnimationNode::getValues() throw (RuntimeException, std::exception) @@ -1342,7 +1296,6 @@ Sequence< Any > SAL_CALL AnimationNode::getValues() } - // XAnimate void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values ) throw (RuntimeException, std::exception) @@ -1353,7 +1306,6 @@ void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values ) } - // XAnimate sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException, std::exception) { @@ -1362,7 +1314,6 @@ sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException, std::exc } - // XAnimate void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException, std::exception) { @@ -1375,7 +1326,6 @@ void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeExce } - // XAnimate Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException, std::exception) { @@ -1384,7 +1334,6 @@ Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException } - // XAnimate void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException, std::exception) { @@ -1394,7 +1343,6 @@ void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) } - // XAnimate sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException, std::exception) { @@ -1403,7 +1351,6 @@ sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException, std::e } - void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1415,7 +1362,6 @@ void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (Runtime } - // XAnimate sal_Int16 SAL_CALL AnimationNode::getCalcMode() throw (RuntimeException, std::exception) @@ -1425,7 +1371,6 @@ sal_Int16 SAL_CALL AnimationNode::getCalcMode() } - // XAnimate void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode ) throw (RuntimeException, std::exception) @@ -1439,7 +1384,6 @@ void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode ) } - // XAnimate sal_Bool SAL_CALL AnimationNode::getAccumulate() throw (RuntimeException, std::exception) @@ -1449,7 +1393,6 @@ sal_Bool SAL_CALL AnimationNode::getAccumulate() } - // XAnimate void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate ) throw (RuntimeException, std::exception) @@ -1463,7 +1406,6 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate ) } - // XAnimate sal_Int16 SAL_CALL AnimationNode::getAdditive() throw (RuntimeException, std::exception) @@ -1473,7 +1415,6 @@ sal_Int16 SAL_CALL AnimationNode::getAdditive() } - // XAnimate void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive ) throw (RuntimeException, std::exception) @@ -1487,7 +1428,6 @@ void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive ) } - // XAnimate Any SAL_CALL AnimationNode::getFrom() throw (RuntimeException, std::exception) @@ -1497,7 +1437,6 @@ Any SAL_CALL AnimationNode::getFrom() } - // XAnimate void SAL_CALL AnimationNode::setFrom( const Any& _from ) throw (RuntimeException, std::exception) @@ -1511,7 +1450,6 @@ void SAL_CALL AnimationNode::setFrom( const Any& _from ) } - // XAnimate Any SAL_CALL AnimationNode::getTo() throw (RuntimeException, std::exception) @@ -1521,7 +1459,6 @@ Any SAL_CALL AnimationNode::getTo() } - // XAnimate void SAL_CALL AnimationNode::setTo( const Any& _to ) throw (RuntimeException, std::exception) @@ -1535,7 +1472,6 @@ void SAL_CALL AnimationNode::setTo( const Any& _to ) } - // XAnimate Any SAL_CALL AnimationNode::getBy() throw (RuntimeException, std::exception) @@ -1545,7 +1481,6 @@ Any SAL_CALL AnimationNode::getBy() } - // XAnimate void SAL_CALL AnimationNode::setBy( const Any& _by ) throw (RuntimeException, std::exception) @@ -1559,7 +1494,6 @@ void SAL_CALL AnimationNode::setBy( const Any& _by ) } - // XAnimate Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter() throw (RuntimeException, std::exception) @@ -1569,7 +1503,6 @@ Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter() } - // XAnimate void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) throw (RuntimeException, std::exception) @@ -1580,7 +1513,6 @@ void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _t } - OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1588,7 +1520,6 @@ OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException, std::exce } - void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1600,7 +1531,6 @@ void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (Runti } - // XAnimateColor sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException, std::exception) { @@ -1609,7 +1539,6 @@ sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeExceptio } - // XAnimateColor void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException, std::exception) { @@ -1622,7 +1551,6 @@ void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) thro } - // XAnimateColor sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::exception) { @@ -1631,7 +1559,6 @@ sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::ex } - // XAnimateColor void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception) { @@ -1644,7 +1571,6 @@ void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeE } - // XAnimateMotion Any SAL_CALL AnimationNode::getPath() throw (RuntimeException, std::exception) { @@ -1653,7 +1579,6 @@ Any SAL_CALL AnimationNode::getPath() throw (RuntimeException, std::exception) } - // XAnimateMotion void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException, std::exception) { @@ -1663,7 +1588,6 @@ void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException } - // XAnimateMotion Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException, std::exception) { @@ -1672,7 +1596,6 @@ Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException, std::exception) } - // XAnimateMotion void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException, std::exception) { @@ -1682,7 +1605,6 @@ void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeExcep } - // XAnimateTransform sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException, std::exception) { @@ -1691,7 +1613,6 @@ sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException, st } - // XAnimateTransform void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException, std::exception) { @@ -1704,7 +1625,6 @@ void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw } - // XTransitionFilter sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException, std::exception) { @@ -1713,7 +1633,6 @@ sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException, std:: } - // XTransitionFilter void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException, std::exception) { @@ -1726,7 +1645,6 @@ void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (Runti } - // XTransitionFilter sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException, std::exception) { @@ -1735,7 +1653,6 @@ sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException, std::exc } - // XTransitionFilter void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException, std::exception) { @@ -1748,7 +1665,6 @@ void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeExce } - // XTransitionFilter sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::exception) { @@ -1757,7 +1673,6 @@ sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::excepti } - // XTransitionFilter void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, std::exception) { @@ -1770,7 +1685,6 @@ void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, } - // XTransitionFilter sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException, std::exception) { @@ -1779,7 +1693,6 @@ sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException, std::e } - // XTransitionFilter void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException, std::exception) { @@ -1792,7 +1705,6 @@ void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (Runtime } - // XAudio Any SAL_CALL AnimationNode::getSource() throw (RuntimeException, std::exception) { @@ -1801,7 +1713,6 @@ Any SAL_CALL AnimationNode::getSource() throw (RuntimeException, std::exception) } - // XAudio void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException, std::exception) { @@ -1811,7 +1722,6 @@ void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeExcep } - // XAudio double SAL_CALL AnimationNode::getVolume() throw (RuntimeException, std::exception) { @@ -1820,7 +1730,6 @@ double SAL_CALL AnimationNode::getVolume() throw (RuntimeException, std::excepti } - // XAudio void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException, std::exception) { @@ -1833,7 +1742,6 @@ void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException } - // XCommand sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException, std::exception) { @@ -1842,7 +1750,6 @@ sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException, std::exc } - // XCommand void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException, std::exception) { @@ -1855,7 +1762,6 @@ void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeExce } - // XCommand Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException, std::exception) { @@ -1864,7 +1770,6 @@ Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException, std::excepti } - // XCommand void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException, std::exception) { @@ -1874,7 +1779,6 @@ void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (Runtim } - // XElementAccess Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException, std::exception) { @@ -1882,7 +1786,6 @@ Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException, std::exce } - // XElementAccess sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException, std::exception) { @@ -1891,7 +1794,6 @@ sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException, std::exc } - // XEnumerationAccess Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration() throw (RuntimeException, std::exception) @@ -1902,8 +1804,6 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration() } - - // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) @@ -1929,7 +1829,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc } - // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) @@ -1959,7 +1858,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference } - // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) @@ -1988,7 +1886,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc } - // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) @@ -2011,7 +1908,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference } - // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) @@ -2038,7 +1934,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference } - // XIterateContainer sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException, std::exception) { @@ -2047,7 +1942,6 @@ sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException, std: } - // XIterateContainer void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException, std::exception) { @@ -2060,7 +1954,6 @@ void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (Run } - // XIterateContainer double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException, std::exception) { @@ -2069,7 +1962,6 @@ double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException, std } - // XIterateContainer void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException, std::exception) { @@ -2082,7 +1974,6 @@ void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw } - // XChangesNotifier void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) { @@ -2090,7 +1981,6 @@ void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListen } - // XChangesNotifier void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) { @@ -2098,7 +1988,6 @@ void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesLis } - // XUnoTunnel ::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException, std::exception) { @@ -2124,7 +2013,6 @@ const css::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId() } - void AnimationNode::fireChangeListener() { Guard< Mutex > aGuard( maMutex ); @@ -2153,7 +2041,6 @@ void AnimationNode::fireChangeListener() } - } // namespace animcore diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 734d8a04b112..40c2c76c2521 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -345,5 +345,4 @@ com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponent } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 8f362753782d..803f122c3344 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // class AccessibleDialogControlShape @@ -69,7 +68,6 @@ AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialo } - AccessibleDialogControlShape::~AccessibleDialogControlShape() { if ( m_xControlModel.is() ) @@ -80,7 +78,6 @@ AccessibleDialogControlShape::~AccessibleDialogControlShape() } - bool AccessibleDialogControlShape::IsFocused() { bool bFocused = false; @@ -95,7 +92,6 @@ bool AccessibleDialogControlShape::IsFocused() } - bool AccessibleDialogControlShape::IsSelected() { if ( m_pDialogWindow ) @@ -104,7 +100,6 @@ bool AccessibleDialogControlShape::IsSelected() } - void AccessibleDialogControlShape::SetFocused( bool bFocused ) { if ( m_bFocused != bFocused ) @@ -120,7 +115,6 @@ void AccessibleDialogControlShape::SetFocused( bool bFocused ) } - void AccessibleDialogControlShape::SetSelected( bool bSelected ) { if ( m_bSelected != bSelected ) @@ -136,7 +130,6 @@ void AccessibleDialogControlShape::SetSelected( bool bSelected ) } - awt::Rectangle AccessibleDialogControlShape::GetBounds() { awt::Rectangle aBounds( 0, 0, 0, 0 ); @@ -166,7 +159,6 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds() } - void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds ) { if ( m_aBounds.X != aBounds.X || m_aBounds.Y != aBounds.Y || m_aBounds.Width != aBounds.Width || m_aBounds.Height != aBounds.Height ) @@ -177,7 +169,6 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds ) } - vcl::Window* AccessibleDialogControlShape::GetWindow() const { vcl::Window* pWindow = nullptr; @@ -192,7 +183,6 @@ vcl::Window* AccessibleDialogControlShape::GetWindow() const } - OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName ) { OUString sReturn; @@ -216,7 +206,6 @@ OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* p } - void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { rStateSet.AddState( AccessibleStateType::ENABLED ); @@ -333,7 +322,6 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (Runtime } - Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -345,7 +333,6 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_I } - Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -358,7 +345,6 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) t } - sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -390,7 +376,6 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (Ru } - sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -399,7 +384,6 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeExce } - OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -408,7 +392,6 @@ OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (Runti } - OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -417,7 +400,6 @@ OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeExcep } - Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -428,7 +410,6 @@ Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleR } - Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -449,7 +430,6 @@ Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStat } - Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -469,14 +449,12 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( con } - void AccessibleDialogControlShape::grabFocus( ) throw (RuntimeException, std::exception) { // no focus for shapes } - sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -502,7 +480,6 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeExceptio } - sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -550,7 +527,6 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime } - OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -559,7 +535,6 @@ OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeExc } - OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -573,7 +548,6 @@ OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeExceptio } - } // namespace basctl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index e0a34ed2a91a..0e2b988208b5 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -54,13 +54,11 @@ AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj ) } - AccessibleDialogWindow::ChildDescriptor::~ChildDescriptor() { } - AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( const ChildDescriptor& rDesc ) :pDlgEdObj( rDesc.pDlgEdObj ) ,rxAccessible( rDesc.rxAccessible ) @@ -68,7 +66,6 @@ AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( const ChildDescriptor& } - AccessibleDialogWindow::ChildDescriptor& AccessibleDialogWindow::ChildDescriptor::operator=( const ChildDescriptor& rDesc ) { pDlgEdObj = rDesc.pDlgEdObj; @@ -78,7 +75,6 @@ AccessibleDialogWindow::ChildDescriptor& AccessibleDialogWindow::ChildDescriptor } - bool AccessibleDialogWindow::ChildDescriptor::operator==( const ChildDescriptor& rDesc ) { bool bRet = false; @@ -89,7 +85,6 @@ bool AccessibleDialogWindow::ChildDescriptor::operator==( const ChildDescriptor& } - bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor& rDesc ) const { bool bRet = false; @@ -136,7 +131,6 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin } - AccessibleDialogWindow::~AccessibleDialogWindow() { if ( m_pDialogWindow ) @@ -153,7 +147,6 @@ AccessibleDialogWindow::~AccessibleDialogWindow() } - void AccessibleDialogWindow::UpdateFocused() { for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i ) @@ -169,7 +162,6 @@ void AccessibleDialogWindow::UpdateFocused() } - void AccessibleDialogWindow::UpdateSelected() { NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); @@ -187,7 +179,6 @@ void AccessibleDialogWindow::UpdateSelected() } - void AccessibleDialogWindow::UpdateBounds() { for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i ) @@ -203,7 +194,6 @@ void AccessibleDialogWindow::UpdateBounds() } - bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) { bool bVisible = false; @@ -247,7 +237,6 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc ) } - void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc ) { // check, if object is already in child list @@ -276,7 +265,6 @@ void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc ) } - void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc ) { // find object in child list @@ -306,7 +294,6 @@ void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc ) } - void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc ) { if ( IsChildVisible( rDesc ) ) @@ -322,7 +309,6 @@ void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc ) } - void AccessibleDialogWindow::UpdateChildren() { if ( m_pDialogWindow ) @@ -335,7 +321,6 @@ void AccessibleDialogWindow::UpdateChildren() } - void AccessibleDialogWindow::SortChildren() { // sort child list @@ -343,7 +328,6 @@ void AccessibleDialogWindow::SortChildren() } - IMPL_LINK_TYPED( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void ) { DBG_ASSERT(rEvent.GetWindow(), "AccessibleDialogWindow::WindowEventListener: no window!"); @@ -352,7 +336,6 @@ IMPL_LINK_TYPED( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, r } - void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { Any aOldValue, aNewValue; @@ -448,7 +431,6 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo } - void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { if ( m_pDialogWindow ) @@ -624,7 +606,6 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeExcept } - Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -652,7 +633,6 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i } - Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -669,7 +649,6 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw ( } - sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -696,7 +675,6 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeE } - sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -705,7 +683,6 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException, } - OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -718,7 +695,6 @@ OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeExce } - OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -731,7 +707,6 @@ OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException, } - Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -742,7 +717,6 @@ Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelatio } - Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -763,7 +737,6 @@ Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( } - Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -803,7 +776,6 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt } - void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -813,7 +785,6 @@ void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException, std::excepti } - sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -838,7 +809,6 @@ sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException, std } - sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -884,7 +854,6 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeExcept } - OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -893,7 +862,6 @@ OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException } - OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -928,7 +896,6 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro } - sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -943,7 +910,6 @@ sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildInde } - void AccessibleDialogWindow::clearAccessibleSelection() throw (RuntimeException, std::exception) { @@ -954,7 +920,6 @@ void AccessibleDialogWindow::clearAccessibleSelection() } - void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -964,7 +929,6 @@ void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeExcep } - sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -981,7 +945,6 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (Run } - Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -1004,7 +967,6 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal } - void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -1025,7 +987,6 @@ void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) th } - } // namespace basctl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 78518d108792..b2878457c769 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -45,7 +45,6 @@ LibBoxControl::LibBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx } - void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { LibBox* pBox = static_cast<LibBox*>(GetToolBox().GetItemWindow(GetId())); @@ -64,7 +63,6 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPool } - VclPtr<vcl::Window> LibBoxControl::CreateItemWindow( vcl::Window *pParent ) { return VclPtr<LibBox>::Create( pParent, m_xFrame ); @@ -147,7 +145,6 @@ LibBox::LibBox( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFr } - LibBox::~LibBox() { disposeOnce(); diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index 91027417acdc..b5253bbccd4b 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -70,7 +70,6 @@ private: }; - class LibBox : public DocListenerBox { private: diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 04daad9b5fd1..ce0421566ffd 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -396,7 +396,6 @@ bool ModulWindow::BasicStepOut() } - void ModulWindow::BasicStop() { StarBASIC::Stop(); @@ -718,7 +717,6 @@ void ModulWindow::BasicAddWatch() } - void ModulWindow::EditMacro( const OUString& rMacroName ) { DBG_ASSERT( XModule().Is(), "Kein Modul!" ); @@ -1057,7 +1055,6 @@ void ModulWindow::ExecuteGlobal (SfxRequest& rReq) } - void ModulWindow::GetState( SfxItemSet &rSet ) { SfxWhichIter aIter(rSet); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 94b2f18c67b1..3dc1ea04406e 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -220,7 +220,6 @@ public: }; - class WatchWindow : public DockingWindow { private: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 7c8731424cca..0da4d58c3636 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -172,11 +172,9 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, OUString& rVar, OUString& } // namespace - // EditorWindow - class EditorWindow::ChangesListener: public cppu::WeakImplHelper< beans::XPropertiesChangeListener > { @@ -1651,7 +1649,6 @@ WatchWindow::WatchWindow (Layout* pParent) : } - WatchWindow::~WatchWindow() { disposeOnce(); @@ -1855,11 +1852,9 @@ void WatchWindow::UpdateWatches( bool bBasicStopped ) } - // StackWindow - StackWindow::StackWindow (Layout* pParent) : DockingWindow(pParent), aTreeListBox( VclPtr<SvTreeListBox>::Create(this, WB_BORDER | WB_3DLOOK | WB_HSCROLL | WB_TABSTOP) ), @@ -1882,7 +1877,6 @@ StackWindow::StackWindow (Layout* pParent) : } - StackWindow::~StackWindow() { disposeOnce(); @@ -2106,11 +2100,9 @@ EditorWindow::GetComponentInterface(bool bCreate) } - // WatchTreeListBox - WatchTreeListBox::WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits ) : SvHeaderTabListBox( pParent, nWinBits ) {} diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 1bef09deebef..915c19d5b410 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1373,11 +1373,9 @@ ItemType DialogWindow::GetType () const } - // DialogWindowLayout - DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) : Layout(pParent), pChild(nullptr), diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 849b9d900f51..5bc51f8ba139 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -425,7 +425,6 @@ void Shell::InitScrollBars() } - void Shell::InitTabBar() { pTabBar->Enable(); @@ -434,7 +433,6 @@ void Shell::InitTabBar() } - void Shell::OuterResizePixel( const Point &rPos, const Size &rSize ) { AdjustPosSizePixel( rPos, rSize ); @@ -456,7 +454,6 @@ IMPL_LINK_TYPED( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void ) } - bool Shell::NextPage( bool bPrev ) { bool bRet = false; @@ -506,7 +503,6 @@ void Shell::ArrangeTabBar() } - void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if (GetShell()) @@ -583,7 +579,6 @@ void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } - void Shell::CheckWindows() { bool bSetCurWindow = false; @@ -607,7 +602,6 @@ void Shell::CheckWindows() } - void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLibName, bool bDestroy ) { bool bChangeCurWindow = pCurWin; @@ -631,7 +625,6 @@ void Shell::RemoveWindows( const ScriptDocument& rDocument, const OUString& rLib } - void Shell::UpdateWindows() { // remove all windows that may not be displayed @@ -840,7 +833,6 @@ void Shell::RemoveWindow( BaseWindow* pWindow_, bool bDestroy, bool bAllowChange } - sal_uInt16 Shell::InsertWindowInTable( BaseWindow* pNewWin ) { nCurKey++; @@ -849,7 +841,6 @@ sal_uInt16 Shell::InsertWindowInTable( BaseWindow* pNewWin ) } - void Shell::InvalidateBasicIDESlots() { // only those that have an optic effect... diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index e43fa7250c76..3d566faa6bc7 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -176,7 +176,6 @@ bool EntryDescriptor::operator == (EntryDescriptor const& rDesc) const // TreeListBox - TreeListBox::TreeListBox (vcl::Window* pParent, ResId const& rRes) : SvTreeListBox( pParent, IDEResId( sal::static_int_cast<sal_uInt16>( rRes.GetId() ) ) ) , m_aNotifier( *this ) diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 4d0da3c271cd..3d769ea98e8e 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -68,7 +68,6 @@ void BaseWindow::dispose() } - void BaseWindow::Init() { if ( pShellVScrollBar ) @@ -79,12 +78,10 @@ void BaseWindow::Init() } - void BaseWindow::DoInit() { } - void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ) { pShellHScrollBar = pHScroll; @@ -93,7 +90,6 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ) } - IMPL_LINK_TYPED( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void ) { DoScroll( pCurScrollBar ); @@ -156,7 +152,6 @@ bool BaseWindow::AllowUndo() } - void BaseWindow::UpdateData() { } @@ -254,11 +249,9 @@ bool BaseWindow::HasActiveEditor () const } - // DockingWindow - // style bits for DockingWindow WinBits const DockingWindow::StyleBits = WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN | @@ -422,11 +415,9 @@ void DockingWindow::DockThis () } - // ExtendedEdit - ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) : Edit( pParent, nRes ) { @@ -456,7 +447,6 @@ IMPL_LINK_TYPED( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void ) // TabBar - TabBar::TabBar( vcl::Window* pParent ) : ::TabBar( pParent, WinBits( WB_3DLOOK | WB_SCROLL | WB_BORDER | WB_SIZEABLE | WB_DRAG ) ) { @@ -716,7 +706,6 @@ sal_uLong CalcLineCount( SvStream& rStream ) // LibInfos - LibInfos::LibInfos () { } diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 599744d8ad0e..f028bcf80cd7 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -171,7 +171,6 @@ IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void ) } - IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void ) { if (&rEdit == m_pComboBox) @@ -185,7 +184,6 @@ IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void ) } - IMPL_LINK_TYPED( BreakPointDialog, ButtonHdl, Button *, pButton, void ) { if (pButton == m_pOKButton) @@ -236,7 +234,6 @@ IMPL_LINK_TYPED( BreakPointDialog, ButtonHdl, Button *, pButton, void ) } - void BreakPointDialog::UpdateFields( BreakPoint* pBrk ) { if ( pBrk ) @@ -247,7 +244,6 @@ void BreakPointDialog::UpdateFields( BreakPoint* pBrk ) } - BreakPoint* BreakPointDialog::GetSelectedBreakPoint() { size_t nEntry = m_pComboBox->GetEntryPos( m_pComboBox->GetText() ); diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index cc715dfeb296..19d5961eb93b 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -148,7 +148,6 @@ ExtraData* Dll::GetExtraData () // basctl::ExtraData - ExtraData::ExtraData () : pSearchItem(new SvxSearchItem(SID_SEARCH_ITEM)), bChoosingMacro(false), diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index e85168e8ef10..808bf190e0ea 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -166,7 +166,6 @@ void Layout::DataChanged (DataChangedEvent const& rDCEvt) // SplittedSide - // ctor Layout::SplittedSide::SplittedSide (Layout* pParent, Side eSide) : rLayout(*pParent), diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 93815bec1c3f..f6df01cf8bdb 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -267,8 +267,6 @@ void MacroChooser::EnableButton( Button& rButton, bool bEnable ) } - - SbMethod* MacroChooser::GetMacro() { SbMethod* pMethod = nullptr; @@ -286,7 +284,6 @@ SbMethod* MacroChooser::GetMacro() } - void MacroChooser::DeleteMacro() { SbMethod* pMethod = GetMacro(); @@ -467,7 +464,6 @@ void MacroChooser::CheckButtons() } - IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool) { StoreMacroDescription(); @@ -549,7 +545,6 @@ IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void ) } - IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void ) { // select the module in which the macro is put at Neu (new), @@ -607,7 +602,6 @@ IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void ) } - IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void ) { // apart from New/Record the Description is done by LoseFocus @@ -790,7 +784,6 @@ IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void ) } - void MacroChooser::UpdateFields() { SvTreeListEntry* pMacroEntry = m_pMacroBox->GetCurEntry(); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index f90ac3fd3218..894613d2d9b0 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -552,7 +552,6 @@ IMPL_LINK_TYPED( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) // ObjectPage - ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nMode) : TabPage(pParent, rName, "modules/BasicIDE/ui/" + OStringToOUString(rName, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + @@ -920,7 +919,6 @@ void ObjectPage::DeleteCurrent() } - void ObjectPage::EndTabDialog( sal_uInt16 nRet ) { DBG_ASSERT( pTabDlg, "TabDlg nicht gesetzt!" ); diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index c1217366dcb6..2cf25fa54d73 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -62,7 +62,6 @@ static const char aDecorationPropName[] = "Decoration"; static const char aTitlePropName[] = "Title"; - // DlgEdHint diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index edad9fd90799..997d416ade64 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -81,7 +81,6 @@ public: }; - // DlgEditor diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 52a247a09aaa..796941e20f4b 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -132,7 +132,6 @@ public: }; - // DlgEdForm diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 2742a2476e02..577d8509c7eb 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -168,7 +168,6 @@ public: }; - // BasMgrContainerListenerImpl @@ -236,7 +235,6 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr, } - // XEventListener @@ -295,7 +293,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con } - void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) { @@ -322,7 +319,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con } - void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) { @@ -366,8 +362,6 @@ BasicError::BasicError( const BasicError& rErr ) : } - - class BasicLibInfo { private: @@ -1695,7 +1689,6 @@ ErrCode BasicManager::ExecuteMacro( OUString const& i_fullyQualifiedName, OUStri } - class ModuleInfo_Impl : public ModuleInfoHelper { OUString maName; @@ -1716,8 +1709,6 @@ public: }; - - class DialogInfo_Impl : public WeakImplHelper< script::XStarBasicDialogInfo > { OUString maName; @@ -1735,8 +1726,6 @@ public: }; - - class LibraryInfo_Impl : public WeakImplHelper< script::XStarBasicLibraryInfo > { OUString maName; @@ -1780,7 +1769,6 @@ public: }; - class ModuleContainer_Impl : public NameContainerHelper { StarBASIC* mpLib; @@ -1905,8 +1893,6 @@ void ModuleContainer_Impl::removeByName( const OUString& Name ) } - - uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog ) { SvMemoryStream aMemStream; @@ -2086,9 +2072,6 @@ void DialogContainer_Impl::removeByName( const OUString& Name ) } - - - class LibraryContainer_Impl : public NameContainerHelper { BasicManager* mpMgr; @@ -2233,7 +2216,6 @@ void LibraryContainer_Impl::removeByName( const OUString& Name ) } - typedef WeakImplHelper< script::XStarBasicAccess > StarBasicAccessHelper; diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index d62c79e3004b..366df75dff53 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -36,7 +36,6 @@ namespace vba { using namespace ::com::sun::star; - namespace { /** Create an instance of a module manager. @@ -90,7 +89,6 @@ void lclLockControllers( const uno::Reference< frame::XModel >& rxModel, bool bL } - /** Enables or disables the container windows of all controllers of the specified document model. */ @@ -121,7 +119,6 @@ void lclEnableContainerWindows( const uno::Reference< frame::XModel >& rxModel, } - typedef void (*ModifyDocumentFunc)( const uno::Reference< frame::XModel >&, bool ); /** Implementation iterating over all documents that have the same type as the @@ -144,7 +141,6 @@ void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Ref } - struct CurrDirPool { ::osl::Mutex maMutex; @@ -156,21 +152,18 @@ struct StaticCurrDirPool : public ::rtl::Static< CurrDirPool, StaticCurrDirPool } // namespace - void lockControllersOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, bool bLockControllers ) { lclIterateDocuments( &lclLockControllers, rxModel, bLockControllers ); } - void enableContainerWindowsOfAllDocuments( const uno::Reference< frame::XModel >& rxModel, bool bEnableWindows ) { lclIterateDocuments( &lclEnableContainerWindows, rxModel, bEnableWindows ); } - void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, const OUString& rPath ) { if( !rPath.isEmpty() ) @@ -191,7 +184,6 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c } - } // namespace vba } // namespace basic diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index 5c54cb0c7dea..62e4790eb411 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -560,6 +560,4 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index b43f8e78f874..ede6abb23156 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -51,7 +51,6 @@ SbPropertyValues::SbPropertyValues() } - SbPropertyValues::~SbPropertyValues() { m_xInfo.clear(); @@ -78,7 +77,6 @@ Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo() throw( Runt } - size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const { SbPropertyValueArr_Impl::const_iterator it = std::lower_bound( @@ -94,7 +92,6 @@ size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const } - void SbPropertyValues::setPropertyValue( const OUString& aPropertyName, const Any& aValue) @@ -110,7 +107,6 @@ void SbPropertyValues::setPropertyValue( } - Any SbPropertyValues::getPropertyValue( const OUString& aPropertyName) throw(css::beans::UnknownPropertyException, @@ -122,7 +118,6 @@ Any SbPropertyValues::getPropertyValue( } - void SbPropertyValues::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) @@ -132,7 +127,6 @@ void SbPropertyValues::addPropertyChangeListener( } - void SbPropertyValues::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) @@ -142,7 +136,6 @@ void SbPropertyValues::removePropertyChangeListener( } - void SbPropertyValues::addVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) @@ -152,7 +145,6 @@ void SbPropertyValues::addVetoableChangeListener( } - void SbPropertyValues::removeVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) @@ -162,14 +154,12 @@ void SbPropertyValues::removeVetoableChangeListener( } - Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (css::uno::RuntimeException, std::exception) { return comphelper::containerToSequence(m_aPropVals); } - void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPropertyValues ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index bfdfcef8c1e4..a3a09e654b26 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -63,7 +63,6 @@ using com::sun::star::uno::UNO_QUERY; using com::sun::star::lang::XMultiServiceFactory; - class DocBasicItem : public ::cppu::WeakImplHelper< util::XCloseListener > { public: @@ -95,7 +94,6 @@ private: }; - DocBasicItem::DocBasicItem( StarBASIC& rDocBasic ) : mrDocBasic( rDocBasic ), mxClassModules( new SbxObject( OUString() ) ), @@ -172,7 +170,6 @@ void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) thr } - namespace { typedef ::rtl::Reference< DocBasicItem > DocBasicItemRef; @@ -229,7 +226,6 @@ StarBASIC* lclGetDocBasicForModule( SbModule* pModule ) } // namespace - SbxObject* StarBASIC::getVBAGlobals( ) { if ( !pVBAGlobals ) @@ -485,7 +481,6 @@ SbxObject* SbOLEFactory::CreateObject( const OUString& rClassName ) } - // SbFormFactory, show user forms by: dim as new <user form name> class SbFormFactory : public SbxFactory @@ -529,7 +524,6 @@ SbxObject* SbFormFactory::CreateObject( const OUString& rClassName ) } - // SbTypeFactory SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj ) @@ -627,7 +621,6 @@ SbxObject* createUserTypeImpl( const OUString& rClassName ) } - SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule ) : SbModule( pClassModule->GetName() ) , mpClassModule( pClassModule ) diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 316234e0ceee..d58e28a3d518 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -1080,7 +1080,6 @@ Any sbxToUnoValueImpl( const SbxValue* pVar, bool bBlockConversionToSmallestType } - // Helper function for StepREDIMP static Any implRekMultiDimArrayToSequence( SbxDimArray* pArray, const Type& aElemType, short nMaxDimIndex, short nActualDim, @@ -1797,7 +1796,6 @@ OUString Impl_GetSupportedInterfaces(SbUnoObject& rUnoObj) } - // Debugging help method SbxDataType -> String OUString Dbg_SbxDataType2String( SbxDataType eType ) { @@ -2456,8 +2454,6 @@ void SbUnoObject::doIntrospection() } - - // Start of a list of all SbUnoMethod-Instances static SbUnoMethod* pFirst = nullptr; @@ -3743,7 +3739,6 @@ void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } - static SbUnoServiceCtor* pFirstCtor = nullptr; void clearUnoServiceCtors() @@ -3859,8 +3854,6 @@ void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } - - // Implementation of an EventAttacher-drawn AllListener, which // solely transmits several events to an general AllListener class BasicAllListener_Impl : public WeakImplHelper< XAllListener > @@ -3883,7 +3876,6 @@ public: }; - BasicAllListener_Impl::BasicAllListener_Impl(const OUString& aPrefixName_) : aPrefixName( aPrefixName_ ) { @@ -3895,7 +3887,6 @@ BasicAllListener_Impl::~BasicAllListener_Impl() } - void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet ) { SolarMutexGuard guard; @@ -3969,8 +3960,6 @@ void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeExcep } - - // class InvocationToAllListenerMapper // helper class to map XInvocation to XAllListener (also in project eventattacher!) @@ -4021,7 +4010,6 @@ Reference< XInterface > createAllListenerAdapter } - // InvocationToAllListenerMapper InvocationToAllListenerMapper::InvocationToAllListenerMapper ( const Reference< XIdlClass >& ListenerType, const Reference< XAllListener >& AllListener, const Any& Helper ) @@ -4292,7 +4280,6 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, bool bWrite ) } - class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent > { ::osl::Mutex m_aMutex; @@ -4379,7 +4366,6 @@ void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const A // TODO: OutParameter? - } Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 70ca3476c73e..5c25d28463ce 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -642,7 +642,6 @@ SbIfaceMapperMethod::~SbIfaceMapperMethod() } - // From the code generator: remove invalid entries void SbModule::EndDefinitions( bool bNewState ) @@ -1979,8 +1978,6 @@ bool SbJScriptModule::StoreData( SvStream& rStrm ) const } - - SbMethod::SbMethod( const OUString& r, SbxDataType t, SbModule* p ) : SbxMethod( r, t ), pMod( p ) { diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index f652b858e85e..e11236f8a2d7 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -491,7 +491,6 @@ public: }; - template < class T, class S > class BufferTransformer : public PCodeVisitor< T > { diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 48acf02fa837..02ebc2efb28e 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -254,7 +254,6 @@ bool SbiParser::TestSymbol( bool bKwdOk ) } - bool SbiParser::TestToken( SbiToken t ) { if( Peek() == t ) @@ -269,7 +268,6 @@ bool SbiParser::TestToken( SbiToken t ) } - bool SbiParser::TestComma() { SbiToken eTok = Peek(); @@ -288,7 +286,6 @@ bool SbiParser::TestComma() } - void SbiParser::TestEoln() { if( !IsEoln( Next() ) ) @@ -299,7 +296,6 @@ void SbiParser::TestEoln() } - void SbiParser::StmntBlock( SbiToken eEnd ) { SbiToken xe = eEndTok; diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index ba20518753db..c75f7c6a06d7 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -490,7 +490,6 @@ void SbiProcDef::setPropertyMode( PropertyMode ePropMode ) } - SbiConstDef::SbiConstDef( const OUString& rName ) : SbiSymDef( rName ) { diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 5f2ed0fa3d53..967f55872dda 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -32,7 +32,6 @@ namespace basic { - class SfxDialogLibraryContainer : public SfxLibraryContainer { // Methods to distinguish between different library types @@ -94,7 +93,6 @@ public: }; - typedef ::cppu::ImplHelper1 < css::resource::XStringResourceSupplier > SfxDialogLibrary_BASE; diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index e286ffd8284d..10c33e98e848 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -66,7 +66,6 @@ typedef ::cppu::WeakImplHelper< css::util::XChangesNotifier > NameContainer_BASE; - class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE { typedef std::unordered_map < OUString, sal_Int32, OUStringHash > NameContainerNameMap; @@ -153,7 +152,6 @@ public: }; - class ModifiableHelper { private: @@ -184,7 +182,6 @@ public: }; - typedef ::comphelper::OListenerContainerBase< css::script::vba::XVBAScriptListener, css::script::vba::VBAScriptEvent > VBAScriptListenerContainer_BASE; @@ -202,7 +199,6 @@ private: }; - class SfxLibrary; typedef ::cppu::WeakComponentImplHelper< @@ -532,7 +528,6 @@ public: }; - class LibraryContainerMethodGuard { public: @@ -548,7 +543,6 @@ public: }; - class SfxLibrary : public css::container::XNameContainer , public css::container::XContainer @@ -710,7 +704,6 @@ protected: }; - class ScriptSubPackageIterator { css::uno::Reference< css::deployment::XPackage > m_xMainPackage; @@ -733,7 +726,6 @@ public: }; - class ScriptExtensionIterator { public: @@ -776,7 +768,6 @@ protected: }; // end class ScriptExtensionIterator - } // namespace basic #endif diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx index e5b42762e76b..fe5eabfe0f6f 100644 --- a/basic/source/inc/parser.hxx +++ b/basic/source/inc/parser.hxx @@ -141,10 +141,6 @@ public: }; - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index ec227a44647b..10c0547f8e4b 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -34,8 +34,6 @@ typedef ::cppu::WeakImplHelper< css::beans::XPropertySet, css::beans::XPropertyAccess > SbPropertyValuesHelper; - - class SbPropertyValues: public SbPropertyValuesHelper { SbPropertyValueArr_Impl m_aPropVals; diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx index 14cfc096b602..9fa77e0c3d15 100644 --- a/basic/source/inc/sbjsmod.hxx +++ b/basic/source/inc/sbjsmod.hxx @@ -38,5 +38,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 4c01fb14a0b4..4aa566ea5328 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -176,7 +176,6 @@ public: }; - class SbUnoProperty : public SbxProperty { friend class SbUnoObject; @@ -347,7 +346,6 @@ void disposeComVariablesForBasic( StarBASIC* pBasic ); void clearNativeObjectWrapperVector(); - // #118116 Collection object class BasicCollection : public SbxObject diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 69914c9a37a7..8913dc8dc71f 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -29,7 +29,6 @@ namespace basic { - class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPassword { OUString maScriptLanguage; @@ -176,7 +175,6 @@ protected: }; - } // namespace basic #endif diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index dbd58613da73..07084e4a798b 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -183,5 +183,4 @@ RTLFUNC(InputBox) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 6e4b35bf0eb4..f6e9487b8a6a 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -62,7 +62,6 @@ using namespace com::sun::star::bridge; #include "sbintern.hxx" - class SbiInputDialog : public ModalDialog { VclPtr<Edit> aInput; VclPtr<OKButton> aOk; @@ -304,7 +303,6 @@ bool hasUno() } - class OslStream : public SvStream { osl::File maFile; @@ -757,7 +755,6 @@ SbError SbiStream::Write( const OString& rBuf, sal_uInt16 n ) } - SbiIoSystem::SbiIoSystem() { for( short i = 0; i < CHANNELS; i++ ) diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index c28ddd2ca532..4f626caa24de 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -171,7 +171,6 @@ static uno::Reference< ucb::XSimpleFileAccess3 > getFileAccess() } - // Properties and methods lie down the return value at the Get (bPut = sal_False) in the // element 0 of the Argv; the value of element 0 is saved at Put (bPut = sal_True) @@ -297,7 +296,6 @@ RTLFUNC(Atn) } - RTLFUNC(Abs) { (void)pBasic; @@ -1077,7 +1075,6 @@ RTLFUNC(Int) } - RTLFUNC(Fix) { (void)pBasic; @@ -2684,7 +2681,6 @@ RTLFUNC(IsNumeric) } - RTLFUNC(IsMissing) { (void)pBasic; diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index d42947f28fb4..ec998c7ca7c5 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -984,7 +984,6 @@ RTLFUNC(FindPropertyObject) } - static bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, bool bBinary, short nBlockLen, bool bIsArray ) { diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index e1fd7686ef9f..1116d3316182 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1273,8 +1273,6 @@ SbiForStack* SbiRuntime::FindForStackItemForCollection( class BasicCollection* p } - - // DLL-calls void SbiRuntime::DllCall @@ -3656,7 +3654,6 @@ SbxBase* SbiRuntime::FindElementExtern( const OUString& rName ) } - void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 ) { if( nOp1 & 0x8000 ) diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 0ca186716cfe..e5dfe17e1572 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -56,9 +56,6 @@ SbxObject* SbStdFactory::CreateObject( const OUString& rClassName ) } - - - void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) @@ -110,7 +107,6 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite ) } - SbStdPicture::SbStdPicture() : SbxObject( OUString("Picture")) { @@ -138,7 +134,6 @@ SbxVariable* SbStdPicture::Find( const OUString& rName, SbxClassType t ) } - void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { @@ -170,7 +165,6 @@ void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } - void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, bool bWrite ) { if( bWrite ) @@ -297,9 +291,6 @@ void SbStdFont::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } - - - void SbStdClipboard::MethClear( SbxVariable*, SbxArray* pPar_, bool ) { if( pPar_ && (pPar_->Count() > 1) ) @@ -390,7 +381,6 @@ void SbStdClipboard::MethSetText( SbxVariable* pVar, SbxArray* pPar_, bool ) } - SbStdClipboard::SbStdClipboard() : SbxObject( OUString("Clipboard") ) { @@ -430,7 +420,6 @@ SbxVariable* SbStdClipboard::Find( const OUString& rName, SbxClassType t ) } - void SbStdClipboard::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint); diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx index 26e9aa58ddde..d2bc0fd3a48d 100644 --- a/basic/source/sbx/sbxform.cxx +++ b/basic/source/sbx/sbxform.cxx @@ -82,8 +82,6 @@ COMMENT: Visual-Basic treats the following (invalid) format-strings // be generated. That's a StarBasic 'extension'. - - double get_number_of_digits( double dNumber ) //double floor_log10_fabs( double dNumber ) { diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 3704d288db93..bd603ac48156 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -34,7 +34,6 @@ static OUString pParentProp; // Parent-Property static sal_uInt16 nNameHash = 0, nParentHash = 0; - SbxObject::SbxObject( const OUString& rClass ) : SbxVariable( SbxOBJECT ), aClassName( rClass ) { diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index fe76af29bb18..d73c8ddafd12 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -362,7 +362,6 @@ void ModifiableHelper::setModified( bool _bModified ) } - VBAScriptListenerContainer::VBAScriptListenerContainer( ::osl::Mutex& rMutex ) : VBAScriptListenerContainer_BASE( rMutex ) { diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index d24221d46433..26456292b078 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -350,8 +350,6 @@ void Bridge::terminate(bool final) { } - - BinaryAny Bridge::mapCppToBinaryAny(css::uno::Any const & cppAny) { css::uno::Any in(cppAny); BinaryAny out; diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx index 9368cd2d2f3d..5f23b4647208 100644 --- a/binaryurp/source/proxy.cxx +++ b/binaryurp/source/proxy.cxx @@ -74,7 +74,6 @@ Proxy::Proxy( } - void Proxy::do_acquire() { if (osl_atomic_increment(&references_) == 1) { bridge_->resurrectProxy(*this); diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx index 37ba95d7acc1..8bcd1ccc817b 100644 --- a/bridges/inc/bridges/cpp_uno/bridge.hxx +++ b/bridges/inc/bridges/cpp_uno/bridge.hxx @@ -135,12 +135,6 @@ inline cppu_cppInterfaceProxy::cppu_cppInterfaceProxy( } - - - - - - inline void SAL_CALL cppu_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy ) { cppu_unoInterfaceProxy * pThis = @@ -257,12 +251,6 @@ inline cppu_unoInterfaceProxy::cppu_unoInterfaceProxy( } - - - - - - inline void SAL_CALL cppu_Mapping_acquire( uno_Mapping * pMapping ) { static_cast< cppu_Mapping * >( pMapping )->pBridge->acquire(); @@ -375,10 +363,6 @@ inline void SAL_CALL cppu_ext_getMapping( } - - - - // environment init stuff inline const OUString & SAL_CALL cppu_cppenv_getStaticOIdPart() diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx index af4583865570..0bb976716435 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx @@ -304,7 +304,6 @@ static typelib_TypeClass cpp2uno_call( } - static typelib_TypeClass cpp_mediate( sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx index f0fa890496da..966bac6a1366 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx @@ -355,7 +355,6 @@ static typelib_TypeClass cpp_mediate( } - /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index d229de63f476..46f8d0f03111 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -466,7 +466,6 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( } - unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset, diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 5e2b30ff551f..3813d9bb04f5 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -457,7 +457,6 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock( } - unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions( Slot ** slots, unsigned char * code, typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset, diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx index 8742b72fd65c..4b22dc843076 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx @@ -354,7 +354,6 @@ static typelib_TypeClass cpp_mediate( } - /** * is called on incoming vtable calls * (called by asm snippets) diff --git a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx index 2e96e8478380..356f36092e31 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx @@ -18,8 +18,6 @@ */ - - #pragma warning(push,1) // disable warnings within system headers #include <windows.h> #pragma warning(pop) diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx index 2e96e8478380..356f36092e31 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/dllinit.cxx @@ -18,8 +18,6 @@ */ - - #pragma warning(push,1) // disable warnings within system headers #include <windows.h> #pragma warning(pop) diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx index 08c198cec631..7de2d6c100a7 100644 --- a/bridges/source/jni_uno/jni_data.cxx +++ b/bridges/source/jni_uno/jni_data.cxx @@ -1152,7 +1152,6 @@ void Bridge::map_to_uno( } - void Bridge::map_to_java( JNI_context const & jni, jvalue * java_data, void const * uno_data, diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx index 89e4b0bb5564..f06fca589c0b 100644 --- a/bridges/source/jni_uno/jni_info.cxx +++ b/bridges/source/jni_uno/jni_info.cxx @@ -56,7 +56,6 @@ JNI_type_info::JNI_type_info( } - void JNI_interface_type_info::destroy( JNIEnv * jni_env ) { JNI_type_info::destruct( jni_env ); @@ -222,7 +221,6 @@ JNI_interface_type_info::JNI_interface_type_info( } - void JNI_compound_type_info::destroy( JNIEnv * jni_env ) { JNI_type_info::destruct( jni_env ); @@ -344,7 +342,6 @@ JNI_compound_type_info::JNI_compound_type_info( } - JNI_type_info const * JNI_info::create_type_info( JNI_context const & jni, typelib_TypeDescription * td ) const { diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx index 14ea786dce43..d5280f40f1a7 100644 --- a/bridges/source/jni_uno/jni_java2uno.cxx +++ b/bridges/source/jni_uno/jni_java2uno.cxx @@ -87,7 +87,6 @@ jobject Bridge::map_to_java( } - void Bridge::handle_uno_exc( JNI_context const & jni, uno_Any * uno_exc ) const { if (typelib_TypeClass_EXCEPTION == uno_exc->pType->eTypeClass) diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 1642c7e7aa8f..262893363aeb 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -479,7 +479,6 @@ inline void UNO_proxy::release() const } - uno_Interface * Bridge::map_to_uno( JNI_context const & jni, jobject javaI, JNI_interface_type_info const * info ) const diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 1a6fc47555b5..0d6833dc0e9b 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -160,7 +160,6 @@ namespace dxcanvas }; - // DXRenderModule @@ -761,7 +760,6 @@ namespace dxcanvas } - // DXRenderModule::createDevice diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 79ec10f8a0cc..61e6e85d6812 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -102,7 +102,6 @@ namespace dxcanvas typedef ::rtl::Reference< Canvas > CanvasRef; - typedef ::cppu::WeakComponentImplHelper< css::rendering::XBitmapCanvas, css::rendering::XIntegerBitmap, css::rendering::XGraphicDevice, diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx index 3d5f893a29cf..c9308102747e 100644 --- a/canvas/source/directx/dx_canvashelper_texturefill.cxx +++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx @@ -537,7 +537,6 @@ namespace dxcanvas } - uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas* /*pCanvas*/, const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon, const rendering::ViewState& viewState, diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index c530aaa3e38c..50caa5532ff3 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -49,8 +49,6 @@ class css::rendering::XCanvasFont; using namespace ::com::sun::star; - - namespace dxcanvas { TextLayoutDrawHelper::TextLayoutDrawHelper( diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx index ae1cbb95e4d1..f2a4bcc92cf8 100644 --- a/canvas/source/opengl/ogl_canvasfont.cxx +++ b/canvas/source/opengl/ogl_canvasfont.cxx @@ -16,7 +16,6 @@ #include "ogl_textlayout.hxx" - using namespace ::com::sun::star; namespace oglcanvas diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 6ff146b43b0c..42fd6c5ae7ab 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -358,7 +358,6 @@ namespace } - typedef o3tl::LazyUpdate< rendering::FontRequest, uno::Reference< rendering::XCanvasFont >, diff --git a/canvas/source/vcl/cachedbitmap.cxx b/canvas/source/vcl/cachedbitmap.cxx index 1a7b5afab6fb..72ced6762629 100644 --- a/canvas/source/vcl/cachedbitmap.cxx +++ b/canvas/source/vcl/cachedbitmap.cxx @@ -29,7 +29,6 @@ #include "repainttarget.hxx" - using namespace ::com::sun::star; namespace vclcanvas diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 8853e805eca1..82181eca4b81 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -624,7 +624,6 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill) } - int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, const awt::Point&, const awt::Size& aSize, long rotation, const drawing::HomogenMatrix3& rTrans) { diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 717e0cc51fb9..7e9c466344fa 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -269,8 +269,6 @@ System::String^ mapUnoPolymorphicName(System::String^ unoName) } - - Assembly ^ TypeEmitter::type_resolve( ::System::Object ^, ::System::ResolveEventArgs ^ args ) { @@ -755,7 +753,6 @@ Assembly ^ TypeEmitter::type_resolve( } - ::System::Type ^ TypeEmitter::get_type( Reference< reflection::XServiceTypeDescription2 > const & xType ) { @@ -2049,7 +2046,6 @@ Emit::CustomAttributeBuilder^ TypeEmitter::get_exception_attribute( } - ::System::Type ^ TypeEmitter::get_type( Reference< reflection::XTypeDescription > const & xType ) { diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 241581ddac18..3fb8f98f6dfc 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -53,7 +53,6 @@ void SAL_CALL Mapping_release( uno_Mapping * mapping ) } - void SAL_CALL Mapping_cli2uno( uno_Mapping * mapping, void ** ppOut, void * pIn, typelib_InterfaceTypeDescription * td ) @@ -241,7 +240,6 @@ Bridge::~Bridge() } - } //namespace cli_uno extern "C" diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index e017bcb4c6dc..d569ecfc2927 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -844,7 +844,6 @@ uno_Interface* CliProxy::create(Bridge const * bridge, } - void SAL_CALL CliProxy::uno_DispatchMethod( struct _uno_Interface *, const struct _typelib_TypeDescription *, @@ -886,8 +885,6 @@ inline void CliProxy::release() const } - - extern "C" void SAL_CALL cli_proxy_free( uno_ExtEnvironment *, void * proxy ) SAL_THROW_EXTERN_C() @@ -1109,7 +1106,4 @@ void SAL_CALL cli_proxy_dispatch( } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index 74bf158a53f2..0d1d197a11b8 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -271,8 +271,6 @@ void Bridge::call_cli( } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx index 8853a5b4375e..5568a2d94534 100644 --- a/codemaker/source/codemaker/global.cxx +++ b/codemaker/source/codemaker/global.cxx @@ -267,7 +267,6 @@ OUString convertToFileUrl(const OString& fileName) } - // FileStream FileStream::FileStream() diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index 40b33e30e2b5..0744deae5bbd 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -335,5 +335,4 @@ OString CppuOptions::prepareVersion() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index ea1a7cdcf548..449f2e68877e 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -251,5 +251,4 @@ OString JavaOptions::prepareVersion() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx index 379ac9825338..df7c75f7e693 100644 --- a/comphelper/source/container/container.cxx +++ b/comphelper/source/container/container.cxx @@ -28,7 +28,6 @@ namespace comphelper { - IndexAccessIterator::IndexAccessIterator(css::uno::Reference< css::uno::XInterface> xStartingPoint) :m_xStartingPoint(xStartingPoint) ,m_xCurrentObject(nullptr) @@ -137,5 +136,4 @@ css::uno::Reference< css::uno::XInterface> IndexAccessIterator::Next() } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index 7a7b07725584..e3b03ef46269 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -270,5 +270,4 @@ css::uno::Any SAL_CALL OAnyEnumeration::nextElement( ) } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index d782b744fc42..a896b9e73217 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -137,10 +137,6 @@ private: }; - - - - // Implementation of an EventAttacher-subclass 'AllListeners', which // only passes individual events of the general AllListeners. class AttacherAllListener_Impl : public WeakImplHelper< XAllListener > @@ -179,7 +175,6 @@ AttacherAllListener_Impl::AttacherAllListener_Impl } - // Methods of XAllListener void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) throw( RuntimeException, std::exception ) @@ -401,7 +396,6 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exc } - ::std::deque<AttacherIndex_Impl>::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex ) { if (_nIndex < 0) diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 4e8488d376a1..4d97b8049984 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -177,5 +177,4 @@ namespace comphelper } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index ad56678b6c0c..7ff1bcb5d564 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -299,5 +299,4 @@ namespace comphelper } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index 8cf351993ef2..2b3519eaf92d 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -144,7 +144,6 @@ namespace comphelper { - AccessibleEventNotifier::TClientId AccessibleEventNotifier::registerClient( ) { ::osl::MutexGuard aGuard( lclMutex::get() ); diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx index ef2e058f8020..72fae780e79f 100644 --- a/comphelper/source/misc/accessiblekeybindinghelper.cxx +++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx @@ -38,7 +38,6 @@ namespace comphelper } - OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper( const OAccessibleKeyBindingHelper& rHelper ) : cppu::WeakImplHelper<XAccessibleKeyBinding>( rHelper ) , m_aKeyBindings( rHelper.m_aKeyBindings ) @@ -46,13 +45,11 @@ namespace comphelper } - OAccessibleKeyBindingHelper::~OAccessibleKeyBindingHelper() { } - void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -61,7 +58,6 @@ namespace comphelper } - void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -83,7 +79,6 @@ namespace comphelper } - Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -95,8 +90,6 @@ namespace comphelper } - - } // namespace comphelper diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 98c3c0213261..6113e219833a 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -49,13 +49,11 @@ namespace comphelper } - OCommonAccessibleText::~OCommonAccessibleText() { } - Reference < i18n::XBreakIterator > OCommonAccessibleText::implGetBreakIterator() { if ( !m_xBreakIter.is() ) @@ -68,7 +66,6 @@ namespace comphelper } - Reference < i18n::XCharacterClassification > OCommonAccessibleText::implGetCharacterClassification() { if ( !m_xCharClass.is() ) @@ -80,28 +77,24 @@ namespace comphelper } - bool OCommonAccessibleText::implIsValidBoundary( i18n::Boundary& rBoundary, sal_Int32 nLength ) { return ( rBoundary.startPos >= 0 ) && ( rBoundary.startPos < nLength ) && ( rBoundary.endPos >= 0 ) && ( rBoundary.endPos <= nLength ); } - bool OCommonAccessibleText::implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ) { return ( nIndex >= 0 ) && ( nIndex < nLength ); } - bool OCommonAccessibleText::implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ) { return ( nStartIndex >= 0 ) && ( nStartIndex <= nLength ) && ( nEndIndex >= 0 ) && ( nEndIndex <= nLength ); } - void OCommonAccessibleText::implGetGlyphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -132,7 +125,6 @@ namespace comphelper } - bool OCommonAccessibleText::implGetWordBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { bool bWord = false; @@ -165,7 +157,6 @@ namespace comphelper } - void OCommonAccessibleText::implGetSentenceBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -188,7 +179,6 @@ namespace comphelper } - void OCommonAccessibleText::implGetParagraphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -214,7 +204,6 @@ namespace comphelper } - void OCommonAccessibleText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -233,7 +222,6 @@ namespace comphelper } - sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OUString sText( implGetText() ); @@ -245,14 +233,12 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getCharacterCount() throw (RuntimeException) { return implGetText().getLength(); } - OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException) { OUString sText; @@ -273,7 +259,6 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getSelectionStart() throw (RuntimeException) { sal_Int32 nStartIndex; @@ -285,7 +270,6 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getSelectionEnd() throw (RuntimeException) { sal_Int32 nStartIndex; @@ -297,14 +281,12 @@ namespace comphelper } - OUString OCommonAccessibleText::getText() throw (RuntimeException) { return implGetText(); } - OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OUString sText( implGetText() ); @@ -319,7 +301,6 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OUString sText( implGetText() ); @@ -424,7 +405,6 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OUString sText( implGetText() ); @@ -549,7 +529,6 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { OUString sText( implGetText() ); @@ -801,7 +780,6 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -810,7 +788,6 @@ namespace comphelper } - OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -819,7 +796,6 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -828,7 +804,6 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -837,7 +812,6 @@ namespace comphelper } - OUString OAccessibleTextHelper::getText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -846,7 +820,6 @@ namespace comphelper } - OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -855,7 +828,6 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -864,7 +836,6 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -873,7 +844,6 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -882,8 +852,6 @@ namespace comphelper } - - } // namespace comphelper diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index e6a3f3cf4dc9..91e0e632718b 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -134,5 +134,4 @@ namespace comphelper } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index c6fe94a16892..2dd70e3271b9 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; namespace comphelper { - static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength ) { uno::Sequence< sal_Int8 > aResult; @@ -66,7 +65,6 @@ static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const OUString& aPassword, } - IDocPasswordVerifier::~IDocPasswordVerifier() { } @@ -264,7 +262,6 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( } - /*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId ) { uno::Sequence< sal_Int8 > aResultKey; @@ -348,8 +345,6 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( } - - /*static*/ css::uno::Sequence< css::beans::NamedValue > DocPasswordHelper::requestAndVerifyDocPassword( IDocPasswordVerifier& rVerifier, const css::uno::Sequence< css::beans::NamedValue >& rMediaEncData, diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index e9322eb77132..ba3f6997d163 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -45,7 +45,6 @@ using ::com::sun::star::task::XInteractionRequest; namespace comphelper { - class AbortContinuation : public ::cppu::WeakImplHelper< XInteractionAbort > { public: @@ -53,7 +52,6 @@ public: }; - class PasswordContinuation : public ::cppu::WeakImplHelper< XInteractionPassword2 > { public: @@ -80,7 +78,6 @@ private: }; - SimplePasswordRequest::SimplePasswordRequest( PasswordRequestMode eMode ) { PasswordRequest aRequest( OUString(), Reference< XInterface >(), @@ -118,7 +115,6 @@ Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest } - DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType, PasswordRequestMode eMode, const OUString& rDocumentUrl, bool bPasswordToModify ) { @@ -183,7 +179,6 @@ Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::g } - } // namespace comphelper /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx index da980d66d356..0307e4c48283 100644 --- a/comphelper/source/misc/evtlistenerhlp.cxx +++ b/comphelper/source/misc/evtlistenerhlp.cxx @@ -34,10 +34,4 @@ namespace comphelper } - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 145531d42915..088630691708 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star; - // OInstanceLocker @@ -230,12 +229,9 @@ uno::Reference< uno::XInterface > SAL_CALL OInstanceLocker::Create( } - - // OLockListener - OLockListener::OLockListener( const uno::WeakReference< lang::XComponent >& xWrapper, const uno::Reference< uno::XInterface >& xInstance, sal_Int32 nMode, diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index d16aed741ccd..354af3d2ab9a 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -78,5 +78,4 @@ namespace comphelper } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index c11170b53efa..4a6782e5269c 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -549,7 +549,6 @@ OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString& } - OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMediaType ) { OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) ); @@ -871,7 +870,6 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter( } - bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 ) { if ( aClassID1.getLength() != aClassID2.getLength() ) diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index ef2af9038c23..2dd29cd2f3b7 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.cxx @@ -79,7 +79,6 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference<css::util::XNumb } - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index d03b8acf2517..14de9eec0682 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -248,7 +248,6 @@ namespace comphelper } - } // namespace comphelper diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index aaf03be99502..a6bbeffaa51e 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -31,7 +31,6 @@ #include <memory.h> - namespace comphelper { diff --git a/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx index 039897fa4d5f..de786e5d19c7 100644 --- a/comphelper/source/misc/weakeventlistener.cxx +++ b/comphelper/source/misc/weakeventlistener.cxx @@ -21,7 +21,6 @@ #include <osl/diagnose.h> - namespace comphelper { @@ -72,5 +71,4 @@ namespace comphelper } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index e6c7ed2b9c90..9fbba145a14b 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -51,7 +51,6 @@ AutoOGuardArray::~AutoOGuardArray() } - using namespace ::comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 42b3a9f71b97..64bdf1ab190a 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -88,7 +88,6 @@ namespace comphelper } - GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() : PropertySetHelper( pInfo ) ,m_aListener(maMutex) diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index b31c61744899..20fc6f0544d1 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -37,7 +37,6 @@ #include <iterator> - using namespace ::com::sun::star; void createRegistryInfo_OPropertyBag() @@ -263,7 +262,6 @@ namespace comphelper } - Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 05f4b05a4c6f..50f2bc4a61ca 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -243,14 +243,12 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( } - css::uno::Sequence< css::beans::Property> OPropertyArrayAggregationHelper::getProperties() { return m_aProperties; } - sal_Int32 OPropertyArrayAggregationHelper::fillHandles( sal_Int32* _pHandles, const css::uno::Sequence< OUString >& _rPropNames ) { diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index c8820c2cc271..a3d22c04085f 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.cxx @@ -206,7 +206,6 @@ namespace comphelper } - } // namespace comphelper diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index 8d2cdde76b90..813346270fc1 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -89,5 +89,4 @@ void OPropertyContainer::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 3ed8fc4f83f7..0be4c1fb613d 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -120,7 +120,6 @@ void OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName, } - void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue) { @@ -503,5 +502,4 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) } // namespace comphelper - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index daaadac738bc..859aebec6002 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -55,7 +55,6 @@ PropertyMapEntry const * PropertySetHelperImpl::find( const OUString& aName ) co } - PropertySetHelper::PropertySetHelper( comphelper::PropertySetInfo* pInfo ) throw() { mp = new PropertySetHelperImpl; diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index a97b8abd0ae4..0cbca217ce59 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -128,7 +128,6 @@ bool PropertyMapImpl::hasPropertyByName( const OUString& aName ) throw() } - PropertySetInfo::PropertySetInfo() throw() { mpMap = new PropertyMapImpl(); diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index cbb541105428..0538d3928837 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -41,7 +41,6 @@ namespace comphelper // OPropertyStateHelper - css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception) { css::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index e1413f4b0450..a786cfe16a26 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.cxx @@ -24,7 +24,6 @@ namespace comphelper { - const css::uno::Reference<css::io::XObjectOutputStream>& operator << ( const css::uno::Reference<css::io::XObjectOutputStream>& _rxOutStream, const css::awt::FontDescriptor& _rFont) diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index d2fc2df6087c..2cc98da1bd7d 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -34,7 +34,6 @@ using namespace ::osl; // class SequenceInputStream - SequenceInputStream::SequenceInputStream( css::uno::Sequence<sal_Int8> const & rData) : m_aData(rData) diff --git a/compilerplugins/clang/store/removevirtuals.cxx b/compilerplugins/clang/store/removevirtuals.cxx index f58a5652fefb..86f44773601c 100644 --- a/compilerplugins/clang/store/removevirtuals.cxx +++ b/compilerplugins/clang/store/removevirtuals.cxx @@ -145,7 +145,6 @@ bool RemoveVirtuals::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl ) } - loplugin::Plugin::Registration< RemoveVirtuals > X("removevirtuals", false); } diff --git a/compilerplugins/clang/store/unnecessaryvirtual.cxx b/compilerplugins/clang/store/unnecessaryvirtual.cxx index 5a6d63384750..a5682ce96a96 100644 --- a/compilerplugins/clang/store/unnecessaryvirtual.cxx +++ b/compilerplugins/clang/store/unnecessaryvirtual.cxx @@ -221,7 +221,6 @@ gotfunc: } - loplugin::Plugin::Registration< UnnecessaryVirtual > X("unnecessaryvirtual", false); } diff --git a/compilerplugins/clang/unusedfieldsremove.cxx b/compilerplugins/clang/unusedfieldsremove.cxx index 8ea9a21aeaea..943034cc8826 100644 --- a/compilerplugins/clang/unusedfieldsremove.cxx +++ b/compilerplugins/clang/unusedfieldsremove.cxx @@ -128,7 +128,6 @@ bool UnusedFieldsRemove::VisitFieldDecl( const FieldDecl* fieldDecl ) } - loplugin::Plugin::Registration< UnusedFieldsRemove > X("unusedfieldsremove", false); } diff --git a/compilerplugins/clang/unusedmethodsremove.cxx b/compilerplugins/clang/unusedmethodsremove.cxx index 498f8dc75dea..4da3b16a38bb 100644 --- a/compilerplugins/clang/unusedmethodsremove.cxx +++ b/compilerplugins/clang/unusedmethodsremove.cxx @@ -142,7 +142,6 @@ bool UnusedMethodsRemove::VisitCXXMethodDecl( const CXXMethodDecl* functionDecl } - loplugin::Plugin::Registration< UnusedMethodsRemove > X("unusedmethodsremove", false); } diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx index 49837c447dd6..1e75b812b7c4 100644 --- a/configmgr/source/localizedpropertynode.cxx +++ b/configmgr/source/localizedpropertynode.cxx @@ -45,7 +45,6 @@ NodeMap & LocalizedPropertyNode::getMembers() { } - LocalizedPropertyNode::LocalizedPropertyNode( LocalizedPropertyNode const & other): Node(other), staticType_(other.staticType_), nillable_(other.nillable_) diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx index 3ead60f89a3c..97c32b21fe4f 100644 --- a/configmgr/source/propertynode.cxx +++ b/configmgr/source/propertynode.cxx @@ -48,7 +48,6 @@ rtl::Reference< Node > PropertyNode::clone(bool) const { } - css::uno::Any PropertyNode::getValue(Components & components) { if (!externalDescriptor_.isEmpty()) { css::beans::Optional< css::uno::Any > val( diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index c00defc1d4a1..09ccd98bbcef 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -108,7 +108,6 @@ OUString RootAccess::getAbsolutePathRepresentation() { } - void RootAccess::setAlive(bool b) { alive_ = b; } diff --git a/configmgr/source/setnode.cxx b/configmgr/source/setnode.cxx index 18ad537d2e79..2e63a239ea94 100644 --- a/configmgr/source/setnode.cxx +++ b/configmgr/source/setnode.cxx @@ -61,7 +61,6 @@ int SetNode::getMandatory() const { } - bool SetNode::isValidTemplate(OUString const & templateName) const { return Data::equalTemplateNames(templateName, defaultTemplateName_) || (std::find_if( diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 26ef016aae29..aa60abf8c3e2 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -252,5 +252,4 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 34ed9b8f0152..484e0fd2d945 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -244,7 +244,6 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t } - sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { return 0; @@ -275,7 +274,6 @@ Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*c } - Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; @@ -311,15 +309,12 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - - ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } - ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); @@ -436,7 +431,6 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, SAL_WNOUNREACHABLE_CODE_POP - sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { return m_bBOF; diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index e6927497e9c4..be18ec286b1e 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -1342,7 +1342,6 @@ sal_uInt8 ORowSetValue::getUInt8() const } - sal_Int16 ORowSetValue::getInt16() const { sal_Int16 nRet = 0; diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index ebe096f0f232..95a8ebb5bdac 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -110,8 +110,6 @@ namespace connectivity } - - } // connectivity diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index ef03cecd3d30..134e03b1025f 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -33,7 +33,6 @@ #include <tools/fract.hxx> - #if (OSL_DEBUG_LEVEL > 0) #include <iostream> #endif @@ -122,12 +121,9 @@ public: }; - - // FUNCTION PARSER - typedef const sal_Char* StringIteratorT; struct ParserContext diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index fef9a9f07c51..26ec91946edc 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -214,6 +214,4 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/, const OUString& _sElementNa } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 2dc5164caa8e..6069bc227e65 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -245,6 +245,4 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementNam } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 11323dec47ed..f746121e9823 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -135,5 +135,4 @@ void OKeyColumnsHelper::impl_refresh() throw(::com::sun::star::uno::RuntimeExcep } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 7856f522b568..3c2639583b0d 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - OKeysHelper::OKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, const TStringVector& _rVector diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 1decb69a5618..c140474fbcd1 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -220,7 +220,6 @@ namespace dbtools } - } // namespace dbtools diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index 0d8e5c022339..b95cafac3754 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -58,7 +58,6 @@ namespace dbtools using namespace ::com::sun::star::beans; - css::util::Date DBTypeConversion::getStandardDate() { static css::util::Date STANDARD_DB_DATE(1,1,1900); @@ -449,5 +448,4 @@ namespace dbtools } // namespace dbtools - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index da440efd1a13..1765236e2850 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -511,9 +511,7 @@ OUString getStandardSQLState( StandardSQLState _eState ) } - } // namespace dbtools - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 632345565d91..616785da4957 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -203,7 +203,6 @@ OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,cons } - OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern) { OUStringBuffer aSql("CREATE TABLE "); diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 31e563511d0d..7de98df961df 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -61,7 +61,6 @@ namespace dbtools using ::connectivity::OSQLParseNode; - static sal_Unicode lcl_getSeparatorChar( const OUString& _rSeparator, sal_Unicode _nFallback ) { OSL_ENSURE( !_rSeparator.isEmpty(), "::lcl_getSeparatorChar: invalid separator string!" ); @@ -445,5 +444,4 @@ namespace dbtools } // namespace dbtools - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index af6d2fba0488..eaf2762a7190 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -118,5 +118,4 @@ namespace connectivity } // namespace connectivity - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index 2a388385ae54..92d5b0edbb9f 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -55,7 +55,6 @@ namespace connectivity ); - // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 77d1c19d247d..cf205eef1de8 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -503,5 +503,4 @@ m_xDesktop.clear(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index b66718d75013..b9c1bd629a60 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -52,7 +52,6 @@ Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) throw(Runt } - sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeException) { return m_aValue.isNull(); @@ -170,7 +169,6 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet } - Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this ); @@ -222,5 +220,4 @@ void SAL_CALL OCallableStatement::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index 0e25ab6d20fa..a492286d2984 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> - using namespace connectivity; using namespace connectivity::ado; @@ -113,5 +112,4 @@ void OCatalog::refreshUsers() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index e1a98033a00f..5fa9708eeeea 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -281,6 +281,4 @@ void SAL_CALL OAdoColumn::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index c19d8a756bd6..e878effc8ecd 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -126,6 +126,4 @@ void OColumns::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index c1d6ee7eb5d0..ce526c4eaa03 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -286,7 +286,6 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, checkDisposed(OConnection_BASE::rBHelper.bDisposed); - m_pAdoConnection->put_Mode(readOnly ? adModeRead : adModeReadWrite); ADOS::ThrowException(*m_pAdoConnection,*this); } @@ -611,6 +610,4 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 42c28c6be72d..db6e5d63c45b 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -590,5 +590,4 @@ void WpADOUser::Create() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 98450024280d..cbed47b68d4a 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -299,7 +299,6 @@ Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*c } - Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); @@ -369,15 +368,12 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - - ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } - ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); @@ -1215,5 +1211,4 @@ OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQ } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 79f602628941..c76f64e4bbf3 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -119,7 +119,6 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu } - sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -220,5 +219,4 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 colu } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 3b9907d275fe..0fbc2da541c6 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; - ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ODriver_BASE(m_aMutex) ,m_xORB(_xORB) diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 473573e0cadc..a866422472df 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -174,5 +174,4 @@ void SAL_CALL OAdoGroup::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 5e49dd347c76..ebcf88d0efbd 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -72,7 +72,4 @@ void OGroups::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index d0764651c348..f061df161735 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -54,7 +54,6 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection) } - void OAdoIndex::refreshColumns() { TStringVector aVector; @@ -142,7 +141,4 @@ void SAL_CALL OAdoIndex::release() throw() } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index 5dfc2930bc7c..15aa437d535f 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -77,5 +77,4 @@ void OIndexes::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index d76bf93823b8..06b0d3f1b372 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -154,5 +154,4 @@ void SAL_CALL OAdoKey::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 4958d0ccbc08..95d2ca0a72a6 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -104,5 +104,4 @@ void OKeys::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 7e7f553c9c05..47ef748a29ad 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -147,7 +147,6 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep } - sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -306,7 +305,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); @@ -345,15 +343,12 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept } - - ::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } - ::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); @@ -1173,6 +1168,4 @@ void SAL_CALL OResultSet::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 03f8057b1c90..aed8eae119c1 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -176,7 +176,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } - sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index a6a893a4523d..90b825fe8533 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -42,7 +42,6 @@ using namespace ::comphelper; ADOS::ThrowException(*m_pConnection->getConnection(),*this); - using namespace connectivity::ado; @@ -130,7 +129,6 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime } - void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -389,7 +387,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } - sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -473,7 +470,6 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } - Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -484,7 +480,6 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } - void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index cdd7df2775c3..88c33ca3825f 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -99,5 +99,4 @@ void OTables::appendNew(const OUString& _rsNewTable) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 810946ecb1e1..98ffd0e73389 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -209,8 +209,4 @@ void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUStr } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index 081edbcbb2d9..b9b0a1f55868 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -72,5 +72,4 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index dba3c8e894e2..96ccd9d8029a 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -110,5 +110,4 @@ void SAL_CALL OAdoView::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index 155866c1ec30..9702d79a79c2 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -90,6 +90,4 @@ void OViews::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 1319f024c934..e3728bc72675 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -750,6 +750,4 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index fcb5b365ebed..12b1cb966a9b 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -322,7 +322,4 @@ WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) thr } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx index 203e8709751b..4703f1ff7f07 100644 --- a/connectivity/source/drivers/calc/CCatalog.cxx +++ b/connectivity/source/drivers/calc/CCatalog.cxx @@ -61,6 +61,4 @@ void OCalcCatalog::refreshTables() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 9859e65962b5..0cda5f3e6ec8 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -42,7 +42,6 @@ using namespace connectivity::file; typedef connectivity::file::OConnection OConnection_BASE; - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; @@ -52,7 +51,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::sheet; - OCalcConnection::OCalcConnection(ODriver* _pDriver) : OConnection(_pDriver),m_nDocCount(0) { // m_aFilenameExtension is not used @@ -196,7 +194,6 @@ void OCalcConnection::disposing() IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connection", "com.sun.star.sdbc.Connection") - Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -214,7 +211,6 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S } - ::com::sun::star::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -229,7 +225,6 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S } - Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -242,7 +237,6 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE } - Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { @@ -258,7 +252,6 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons } - Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index b58dae027531..8ed737ba4d48 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -47,13 +47,11 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::sheet; - OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon) { } - OCalcDatabaseMetaData::~OCalcDatabaseMetaData() { } @@ -138,7 +136,6 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( ) } - Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) @@ -235,7 +232,6 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( } - OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -244,14 +240,12 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE } - sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { return SAL_MAX_INT32; } - sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { return SAL_MAX_INT32; @@ -273,7 +267,6 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExce } - static bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const OUString& rName ) { Any aAny = xSheets->getByName( rName ); @@ -345,7 +338,6 @@ static bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUSt } - Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types ) @@ -441,5 +433,4 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 132ed1708c73..f1548ba05d9e 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; - // static ServiceInfo OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) @@ -50,7 +49,6 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std // service names from file::OFileDriver - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::calc::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index cc464639e3d1..31f82eeb9ca5 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -172,5 +172,4 @@ void SAL_CALL OCalcResultSet::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index acc7a139e61f..1c871adad62d 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -305,7 +305,6 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe } - static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, sal_Int32 nStartCol, sal_Int32 nStartRow, bool bHasHeaders, const ::Date& rNullDate, @@ -420,7 +419,6 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x } - static OUString lcl_GetColumnStr( sal_Int32 nColumn ) { if ( nColumn < 26 ) diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 9daa41c42a5e..6ad63143a4cd 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -391,5 +391,4 @@ bool ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index ca398f824cd5..80e5211211c2 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -115,5 +115,4 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index f325fea7d3fe..9ad366c3f78b 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -615,6 +615,4 @@ void SAL_CALL ODbaseIndex::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index eeccd0289693..7aa3df1e625d 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -84,5 +84,4 @@ sdbcx::ObjectType ODbaseIndexColumns::appendObject( const OUString& /*_rForName* } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index 38a6d1ebb302..939fd8a2a0a5 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.cxx @@ -117,5 +117,4 @@ void ODbaseIndexes::dropObject(sal_Int32 _nPos, const OUString& /*_sElementName* } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index f3fc19a83921..e83e2702f8aa 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -218,5 +218,4 @@ sal_Int32 ODbaseResultSet::getCurrentFilePos() const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 1098ef233957..2aab28139ea3 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1819,7 +1819,6 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, cons } - ++nPos; // the row values start at 1 const ORowSetValue &thisColVal = rRow.get()[nPos]->get(); const bool thisColIsBound = thisColVal.isBound(); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 1f94999c1903..04211f521b5d 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -131,5 +131,4 @@ Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeExc } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 2b83ef806152..84d7cad7ce81 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -65,7 +65,6 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec) } - // index page ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent) @@ -430,7 +429,6 @@ bool ONDXPage::Delete(sal_uInt16 nNodePos) } - ONDXNode ONDXPage::Split(ONDXPage& rPage) { DBG_ASSERT(IsFull(), "Incorrect Splitting"); @@ -667,7 +665,6 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage) // ONDXNode - void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex) { rStream.ReadUInt32( aKey.nRecord ); // key @@ -733,7 +730,6 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const } - ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent) { if (!aChild.Is() && pIndex) diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index 7d670e3a3f90..a978254f0d12 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sdbc/XResultSet.hpp> - using namespace connectivity::evoab; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 1d5bdaf823f1..d12162c9848e 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -204,7 +204,6 @@ void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, } - void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setFloat", *this ); @@ -290,7 +289,6 @@ void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, c } - void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setCharacterStream", *this ); diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 56119d9ea456..6b86c967efbb 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -490,7 +490,6 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData } - Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index 9d9564ba7de1..12dd47a4076c 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -100,5 +100,4 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException, std } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index 761214e3c0fe..2956e5e0fed6 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -81,8 +81,4 @@ void OColumns::impl_refresh() throw(RuntimeException) } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index fe5c84e424fc..6424a25b6e4a 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -449,6 +449,4 @@ void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsM } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 56299a018dcd..cc976f988fa1 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -230,7 +230,4 @@ OOperandAttr::OOperandAttr(sal_uInt16 _nPos,const Reference< XPropertySet>& _xCo } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 1706910472e7..aa46c7cb38d4 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -238,7 +238,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x } - void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) { setParameter(parameterIndex,x); @@ -340,7 +339,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { setBinaryStream(parameterIndex,x,length ); @@ -559,5 +557,4 @@ void OPreparedStatement::parseParamterElem(const OUString& _sColumnName, OSQLPar } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index c7223c77f573..26a051c78662 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -314,7 +314,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; @@ -1181,7 +1180,6 @@ void OResultSet::sortRows() } - bool OResultSet::OpenImpl() { OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!"); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 1b868e64f122..12b3b3d39555 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -261,7 +261,6 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, } - Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 06fdb5dad407..331251b137bf 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; - OCode::OCode() { } @@ -103,7 +102,6 @@ OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos) } - const ORowSetValue& OOperandValue::getValue() const { return m_aValue; @@ -150,14 +148,12 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS // Implementation of the operators - bool OBoolOperator::operate(const OOperand*, const OOperand*) const { return false; } - void OBoolOperator::Exec(OCodeStack& rCodeStack) { OOperand *pRight = rCodeStack.top(); @@ -404,6 +400,4 @@ void OUnaryOperator::Exec(OCodeStack& rCodeStack) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index c0008d4f8572..a58136702e6a 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -388,7 +388,6 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr } - OBoolOperator* pBoolOp = nullptr; if ( bNot ) pBoolOp = new OOp_OR(); @@ -905,5 +904,4 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index c0e93f126295..91555c65394b 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -741,7 +741,6 @@ void Connection::buildTypeInfo() throw( SQLException) aInfo.nNumPrecRadix = (sal_Int16)xRow->getInt(18); - // Now that we have the type info, save it // in the Hashtable if we don't already have an // entry for this SQL type. diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index 03bdae0e996e..2a8f2bd63f35 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -1742,6 +1742,4 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& cat } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 5e3758ae619f..7b9218cc9518 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -527,7 +527,6 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, } - void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; @@ -625,7 +624,6 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index 89145f47d361..764f561c245d 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -650,7 +650,6 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) } - uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; @@ -696,9 +695,6 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< } - - - void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "close()."); diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 069402ac1558..48b7391932e8 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -407,7 +407,6 @@ sal_Int32 OStatementCommonBase::getStatementChangeCount() const short aStatementType = getSqlInfoItem(isc_info_sql_stmt_type); - ISC_STATUS_ARRAY aStatusVector; ISC_STATUS aErr; diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx index 1b3e227be816..f2d3e7cd23bc 100644 --- a/connectivity/source/drivers/flat/ECatalog.cxx +++ b/connectivity/source/drivers/flat/ECatalog.cxx @@ -57,6 +57,4 @@ void OFlatCatalog::refreshTables() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index 033f0a9aafd2..00cdfd623b13 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.cxx @@ -42,5 +42,4 @@ sdbcx::ObjectType OFlatColumns::createObject(const OUString& _rName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index 090d4f6f3f17..fe5d88f64cab 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; - OFlatDatabaseMetaData::OFlatDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) { } @@ -244,5 +243,4 @@ OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index d697fdc98134..c227ee3d57e5 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -133,5 +133,4 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 797c51f71915..13cc609cfb8a 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -26,7 +26,6 @@ #include <comphelper/types.hxx> - using namespace connectivity; using namespace connectivity::hsqldb; using namespace ::com::sun::star::uno; @@ -150,5 +149,4 @@ Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException, std::e } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 0276998745b2..fcd14fc22b80 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -896,8 +896,6 @@ namespace connectivity } - - } // namespace connectivity diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 38d8e79af05c..79c85879fbf8 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -143,7 +143,6 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nati } - jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key, DataLogFile* logger ) { std::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key); @@ -186,7 +185,6 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: read @@ -207,7 +205,6 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ } - jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger ) { #ifdef HSQLDB_DBG @@ -281,7 +278,6 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: readInt @@ -462,7 +458,6 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: write @@ -521,7 +516,6 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j } - /* * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess * Method: writeInt diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 5cec116c7a59..0894a4b06fa7 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -102,5 +102,4 @@ void OUsers::dropObject(sal_Int32 /*nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 07c9668c0a36..c8d422931aa0 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -129,5 +129,4 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index ce872fc5dfd1..0858b4b9de89 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -352,5 +352,4 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index efd0de8200f0..0a887ded4f92 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx @@ -67,7 +67,6 @@ namespace connectivity { namespace java { namespace sql { } } } // namespace connectivity::java::sql - namespace comphelper { namespace log { namespace convert { diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx index f2f19db3cd3b..82c3ebfc670d 100644 --- a/connectivity/source/drivers/jdbc/Date.cxx +++ b/connectivity/source/drivers/jdbc/Date.cxx @@ -39,6 +39,4 @@ jclass java_util_Date::getMyClass() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index 16d46f5efcc4..48e907819704 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - //************ Class: java.sql.Driver diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 314c2c60c584..611367c9d9eb 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -247,5 +247,4 @@ sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) throw(RuntimeException, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index c767011ddd0c..d4a4c45dbc2f 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - //************ Class: java.sql.Statement @@ -187,7 +186,6 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) } - void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -337,7 +335,6 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com: } - sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -382,7 +379,6 @@ sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(::com::sun:: } - Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; @@ -809,7 +805,6 @@ void java_sql_Statement::createStatement(JNIEnv* _pEnv) } - IMPLEMENT_SERVICE_INFO(java_sql_Statement,"com.sun.star.sdbcx.JStatement","com.sun.star.sdbc.Statement"); void SAL_CALL java_sql_Statement_Base::acquire() throw() @@ -838,5 +833,4 @@ void SAL_CALL java_sql_Statement::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 588cca1c095c..e6381454b3ca 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; - ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM2(const ::rtl::Reference< jvmaccess::VirtualMachine >& _rVM = ::rtl::Reference< jvmaccess::VirtualMachine >(), bool _bSet = false) { diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 9aa42c8bc030..7ff97b20b37e 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -201,7 +201,6 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con } - void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIME_PARAMETER, parameterIndex, x ); @@ -693,6 +692,4 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 88fbf7d72d6c..403629147318 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -355,7 +355,6 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S } - OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(nullptr); @@ -363,7 +362,6 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S } - ::com::sun::star::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -374,7 +372,6 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S } - ::com::sun::star::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -606,7 +603,6 @@ void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x } - void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); @@ -998,6 +994,4 @@ void SAL_CALL java_sql_ResultSet::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index fa72a45eb23f..c06d4e15301c 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -147,7 +147,6 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column } - sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(nullptr); diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 791b86fc4ed2..89cf8972d017 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -189,5 +189,4 @@ java_sql_Timestamp::operator ::com::sun::star::util::DateTime() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 3ef8a7fa37e8..7e0dd97adbbb 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -100,7 +100,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL jdbc_component_getFactory( } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx index eeb36a3d068a..4be299c1cdb7 100644 --- a/connectivity/source/drivers/mork/MColumns.cxx +++ b/connectivity/source/drivers/mork/MColumns.cxx @@ -89,6 +89,4 @@ void OColumns::impl_refresh() throw(RuntimeException) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index e836938ca6c1..f86d5799e9d2 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -44,7 +44,6 @@ namespace connectivity { namespace mork { static const int defaultScope = 0x80; - OConnection::OConnection(MorkDriver* _pDriver) :OSubComponent<OConnection, OConnection_BASE>(static_cast<cppu::OWeakObject*>(_pDriver), this) ,m_pDriver(_pDriver) @@ -386,7 +385,6 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() } - void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext ) { if ( _rError.getResId() != 0 ) diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index 001221100dac..0d6ca812fd55 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -19,7 +19,6 @@ #include <com/sun/star/uno/Sequence.hxx> - namespace connectivity { namespace mork diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index df22af3b012b..50b2fafde8ee 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -225,7 +225,6 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const D } - void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTime", *this ); @@ -244,7 +243,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, doubl } - void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setFloat", *this ); @@ -328,7 +326,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this ); @@ -514,5 +511,4 @@ sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(::com::sun::star: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 2b42921df0c1..a03e3501fbc9 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -143,7 +143,6 @@ sal_Int32 MQueryHelper::getResultCount() const } - bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow ) { /* diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index b0e2f3e2713e..f293f0f4c1c6 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -279,7 +279,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; @@ -325,7 +324,6 @@ sal_uInt32 OResultSet::currentRowCount() } - bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -391,7 +389,6 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI } - OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -413,7 +410,6 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLExceptio } - DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -1029,7 +1025,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } - void OResultSet::fillRowData() throw (css::sdbc::SQLException, css::uno::RuntimeException) { @@ -1314,8 +1309,6 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep } - - void OResultSet::setBoundedColumns(const OValueRow& _rRow, const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, const Reference<XIndexAccess>& _xNames, @@ -1397,7 +1390,6 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, } - bool OResultSet::isCount() const { return (m_pParseTree && @@ -1410,7 +1402,6 @@ bool OResultSet::isCount() const } - // Check for valid row in m_aQuery bool OResultSet::validRow( sal_uInt32 nRow) diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 7335995418d1..ea00095a6b7a 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -85,7 +85,6 @@ namespace connectivity sal_Int32 m_nResultSetConcurrency; - std::shared_ptr< ::connectivity::OSQLParseTreeIterator > m_pSQLIterator; const connectivity::OSQLParseNode* m_pParseTree; diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 5cfa0dc2425c..2fd13f872b94 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -139,7 +139,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, } - OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted) throw ( SQLException, RuntimeException ) { @@ -320,7 +319,6 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept } - void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx index f76f11405a3f..55873de64784 100644 --- a/connectivity/source/drivers/mork/MTable.cxx +++ b/connectivity/source/drivers/mork/MTable.cxx @@ -74,7 +74,4 @@ sdbcx::OCollection* OTable::createIndexes(const TStringVector& _rNames) } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index 6556755ef1fa..6c98d12ea94e 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -26,7 +26,6 @@ #include <comphelper/types.hxx> - using namespace connectivity; using namespace connectivity::mysql; using namespace connectivity::sdbcx; @@ -143,5 +142,4 @@ Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException, st } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 7cd111b0cc15..d9390c3a7dff 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -362,6 +362,4 @@ OUString OMySQLTable::getRenameStart() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index ee39cb1a39a8..e43f540295d8 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -104,5 +104,4 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString& _sElementName) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 5d34e21aea1f..cb5052bf5dd5 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -563,6 +563,4 @@ void OConnection::freeStatementHandle(SQLHANDLE& _pHandle) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 39ca423c7412..72b525cfdf4f 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -405,8 +405,6 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - - ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { @@ -424,7 +422,6 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } - ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index 21c013a2845c..a727ee643ef6 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -207,6 +207,4 @@ sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) throw(RuntimeException, std:: } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index a8e9fee5bb4f..84583c4ea73f 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -232,5 +232,4 @@ bool LoadFunctions(oslModule pODBCso) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 95a9f21d7d4e..b5e185faeec4 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -492,7 +492,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x } - void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) { setScalarParameter(parameterIndex, DataType::FLOAT, 15, x); @@ -645,7 +644,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { // LEM: It is quite unclear to me what the interface here is. @@ -691,11 +689,9 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLExc } - // methods - // initBoundParam // Initialize the bound parameter objects @@ -720,7 +716,6 @@ void OPreparedStatement::initBoundParam () throw(SQLException) } - // allocBindBuf // Allocate storage for the permanent data buffer for the bound // parameter. @@ -741,7 +736,6 @@ void* OPreparedStatement::allocBindBuf( sal_Int32 index,sal_Int32 bufLen) } - // getLengthBuf // Gets the length buffer for the given parameter index @@ -762,7 +756,6 @@ SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index) } - // putParamData // Puts parameter data from a previously bound input stream. The // input stream was bound using SQL_LEN_DATA_AT_EXEC. @@ -879,8 +872,6 @@ void OPreparedStatement::setStream( } - - void OPreparedStatement::FreeParams() { numParams = 0; diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 42d081866ca8..f1bab6f05b6d 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -593,7 +593,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx index 8b197eba9a26..060e94057262 100644 --- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx @@ -224,7 +224,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } - sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE; diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 104a98f4b625..24d5268b79ff 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -44,7 +44,6 @@ using namespace ::comphelper; OTools::ThrowException(m_pConnection,x,m_aStatementHandle,SQL_HANDLE_STMT,*this) - using namespace connectivity::odbc; using namespace com::sun::star::uno; @@ -520,7 +519,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } - sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -629,7 +627,6 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } - Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -640,7 +637,6 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } - void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 8f59ea8a32fe..5928eaeeec48 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -101,7 +101,6 @@ namespace pq_sdbc_driver { - // Helper class for statement lifetime management class ClosableReference : public cppu::WeakImplHelper< com::sun::star::uno::XReference > { @@ -660,7 +659,6 @@ Reference< XNameAccess > Connection::getViews() } - Reference< XNameAccess > Connection::getUsers() throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -684,7 +682,6 @@ Reference< XInterface > ConnectionCreateInstance( } - bool isLog( ConnectionSettings *settings, int loglevel ) { return settings->loglevel >= loglevel && settings->logFile; @@ -728,7 +725,6 @@ void log( ConnectionSettings *settings, sal_Int32 level, const char *str ) } - static const struct cppu::ImplementationEntry g_entries[] = { { diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index ef1c7e24966f..cdfd4463512c 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -78,8 +78,6 @@ public: struct ConnectionSettings; - - // Logging API namespace LogLevel @@ -155,7 +153,6 @@ typedef std::unordered_map< typedef ::std::vector< OString > OStringVector; - typedef std::unordered_map < sal_Int32, diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index fcd4847f75ac..267831bbf433 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1447,7 +1447,6 @@ static void columnMetaData2DatabaseTypeDescription( } - ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 801c2f132e0c..5cd030c6178c 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -169,8 +169,6 @@ Reference< XInterface > DriverCreateInstance( const Reference < XComponentContex } - - class OOneInstanceComponentFactory : public MutexHolder, public cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo > diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index 548aee69001a..f0d7a74ff88d 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -129,7 +129,6 @@ OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQL } - sal_Int32 SequenceResultSetMetaData::getPrecision( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 57d26df07f97..68ff3a14670b 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -986,7 +986,6 @@ sal_Bool Statement::getMoreResults( ) } - void Statement::disposing() { close(); diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 661f696616a9..1eeabfa69219 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -319,7 +319,6 @@ Statics & getStatics() keyDescDef, sizeof(keyDescDef)/sizeof(PropertyDef), 0 ); - // KeyColumn props set statics.refl.keycolumn.implName = "org.openoffice.comp.pq.sdbcx.KeyColumn"; statics.refl.keycolumn.serviceNames = Sequence< OUString > ( 1 ); @@ -727,7 +726,6 @@ Statics & getStatics() } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 071fbd7b84fc..0c70c9db06ee 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -959,8 +959,6 @@ OUString sqltype2string( const Reference< XPropertySet > & desc ) } - - static void keyType2String( OUStringBuffer & buf, sal_Int32 keyType ) { if( com::sun::star::sdbc::KeyRule::CASCADE == keyType ) diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index 040f2bb08218..325b3b4b4383 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -171,7 +171,6 @@ public: }; - } #endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_POSTGRESQL_PQ_UPDATEABLERESULTSET_HXX diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index 7a3e053814b9..68259ebe9e17 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -91,9 +91,6 @@ Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) throw (Runt } - - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index 333192d848f5..d5d61cae2e98 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -568,7 +568,6 @@ Reference< com::sun::star::container::XNameAccess > Columns::create( } - ColumnDescriptors::ColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 6ce1c9c2099a..da865cc95ed1 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -160,7 +160,6 @@ Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std:: } - IndexDescriptor::IndexDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, @@ -233,8 +232,6 @@ Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index 5bc09afd0aab..d22312e4fd2c 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -301,7 +301,6 @@ Reference< com::sun::star::container::XNameAccess > Indexes::create( } - IndexDescriptors::IndexDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index e47a0434706e..2f216dd4d1f8 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -162,7 +162,6 @@ Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::ex } - KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index bfdfd24f1e8f..f22cc3e87cb2 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -169,7 +169,6 @@ void KeyColumns::refresh() } - void KeyColumns::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& future ) throw (::com::sun::star::sdbc::SQLException, diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index 39165fec26df..916034dfe6e6 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -346,8 +346,6 @@ void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::Runti } - - TableDescriptor::TableDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index 6812c25ff7c1..38e4a5c733a9 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -134,7 +134,6 @@ public: }; - class TableDescriptor : public ReflectionBase, public com::sun::star::sdbcx::XColumnsSupplier, diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index e090562cbaf5..9bb698273061 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -227,7 +227,6 @@ void View::setName( const OUString& aName ) throw (::com::sun::star::uno::Runtim } - ViewDescriptor::ViewDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, const Reference< com::sun::star::sdbc::XConnection > & connection, diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index fbc2ebaebddb..db4cf6fbefaf 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -249,7 +249,6 @@ void Views::disposing() } - }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index fba73837c02d..7f2b75153ec0 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -138,7 +138,6 @@ namespace connectivity {WpOLEBase<Ts>::operator=(rhs); return *this;}; - inline void Refresh(){pInterface->Refresh();} inline sal_Int32 GetItemCount() const diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 9907e828013c..f97ba0673b17 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -60,7 +60,6 @@ namespace connectivity {WpOLEBase<ADOConnection>::operator=(rhs); return *this;} - WpADOProperties get_Properties() const; OUString GetConnectionString() const; @@ -154,7 +153,6 @@ namespace connectivity WpOLEBase<ADOCommand>::operator=(rhs); return *this;} - sal_Bool putref_ActiveConnection( WpADOConnection *pCon); void put_ActiveConnection(/* [in] */ const OLEVariant& vConn); @@ -192,7 +190,6 @@ namespace connectivity {WpOLEBase<ADOError>::operator=(rhs); return *this;} - OUString GetDescription() const; OUString GetSource() const ; sal_Int32 GetNumber() const ; @@ -201,8 +198,6 @@ namespace connectivity }; - - class WpADOField : public WpOLEBase<ADOField> { // friend class WpADOFields; @@ -251,8 +246,6 @@ namespace connectivity }; - - class WpADOProperty: public WpOLEBase<ADOProperty> { public: diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 18b143ac8dd0..9c137a02be49 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -78,9 +78,6 @@ namespace connectivity }; - - - class ONDXPage; // Index Page Pointer @@ -327,8 +324,6 @@ namespace connectivity } - - #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 9037f6dfd44f..cdb88fa15213 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -88,7 +88,6 @@ namespace connectivity OKeySet::Vector::iterator m_aFileSetIter; - OSortIndex* m_pSortIndex; ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index 85576b9c837e..7134fb1c8d59 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -76,7 +76,6 @@ namespace connectivity { namespace jdbc }; - } } // namespace connectivity::jdbc diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 760e01886c99..8a23976eefb1 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.hxx @@ -99,7 +99,6 @@ namespace connectivity { namespace jdbc }; - } } // namespace connectivity::jdbc diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx index 44af7ef3a87d..e222bd055f4a 100644 --- a/connectivity/source/inc/java/sql/Timestamp.hxx +++ b/connectivity/source/inc/java/sql/Timestamp.hxx @@ -47,7 +47,6 @@ namespace connectivity }; - //************ Class: java.sql.Time diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index ff544c9fb047..b617f431e685 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -227,7 +227,6 @@ namespace connectivity } - } } #endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OTOOLS_HXX diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx index e6ea846b7cfe..860d5cabce6d 100644 --- a/connectivity/source/parse/internalnode.cxx +++ b/connectivity/source/parse/internalnode.cxx @@ -55,7 +55,6 @@ OSQLInternalNode::OSQLInternalNode(const OUString &_NewValue, } - OSQLInternalNode::~OSQLInternalNode() { // remove the node from the garbage list diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 2aeb49f19ece..a32e5e5ca9f7 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1017,7 +1017,6 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele } - bool OSQLParseTreeIterator::traverseOrderByColumnNames(const OSQLParseNode* pSelectNode) { traverseByColumnNames( pSelectNode, true ); diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 7f7fdebfc9ad..6a7bb9956464 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -750,7 +750,6 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, c } - bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode, ::com::sun::star::uno::Any &_rCatalog, OUString &_rSchema, @@ -1300,7 +1299,6 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString } - OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext) :m_pContext(_pContext) ,m_pParseTree(nullptr) diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 15953687c993..7e41705efcb0 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -169,5 +169,4 @@ void SAL_CALL OGroup::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index 9c478f335233..6357b88c676b 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.cxx @@ -107,6 +107,4 @@ void OIndexColumn::construct() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index bec457e0a1cc..d47b1a6f7fd9 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.cxx @@ -111,7 +111,4 @@ void OKeyColumn::construct() } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 376f55889309..af4385024d4b 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -184,5 +184,4 @@ void SAL_CALL OUser::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index a1c9813b4a33..fe3b0ff1ebdc 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -130,5 +130,4 @@ void SAL_CALL OView::release() throw() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index 3769c478e72d..422627f80559 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -41,7 +41,6 @@ using namespace com::sun::star::beans; using namespace cppu; - void main( int argc, char * argv[] ) { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index 433964b8ef0f..e8ff2b91133d 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -102,7 +102,6 @@ namespace connectivity void releaseBuffer(); - // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx index 02de8589db73..8ffa1c6ab862 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx @@ -18,7 +18,6 @@ */ - #include <com/sun/star/rendering/RepaintResult.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 7fbabf6fe00f..183eace5d97a 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1255,7 +1255,6 @@ namespace cppcanvas // are all handled locally. - case MetaActionType::PUSH: { MetaPushAction* pPushAction = static_cast<MetaPushAction*>(pCurrAct); @@ -1536,14 +1535,12 @@ namespace cppcanvas break; - // In the second part of this monster-switch, we // handle all recursing meta actions. These are the // ones generating a metafile by themselves, which is // then processed by recursively calling this method. - case MetaActionType::GRADIENT: { MetaGradientAction* pGradAct = static_cast<MetaGradientAction*>(pCurrAct); @@ -1801,14 +1798,12 @@ namespace cppcanvas break; - // In the third part of this monster-switch, we // handle all 'acting' meta actions. These are all // processed by constructing function objects for // them, which will later ease caching. - case MetaActionType::POINT: { const OutDevState& rState( rStates.getState() ); diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx index 43913529778e..46073c5ef516 100644 --- a/cppcanvas/source/mtfrenderer/mtftools.cxx +++ b/cppcanvas/source/mtfrenderer/mtftools.cxx @@ -39,7 +39,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - using namespace ::com::sun::star; namespace cppcanvas diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx index 06bde882fb09..5c94513bce7f 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx @@ -229,8 +229,6 @@ namespace cppcanvas } - - class TexturedPolyPolyAction : public CachedPrimitiveBase { public: @@ -344,7 +342,6 @@ namespace cppcanvas } - class StrokedPolyPolyAction : public CachedPrimitiveBase { public: diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index d44521e55999..306b32ef7778 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -606,8 +606,6 @@ namespace cppcanvas } - - class TextAction : public Action, private ::boost::noncopyable { public: @@ -759,8 +757,6 @@ namespace cppcanvas } - - class EffectTextAction : public Action, public TextRenderer, @@ -1000,8 +996,6 @@ namespace cppcanvas } - - class TextArrayAction : public Action, private ::boost::noncopyable { public: @@ -1178,8 +1172,6 @@ namespace cppcanvas } - - class EffectTextArrayAction : public Action, public TextRenderer, @@ -1516,8 +1508,6 @@ namespace cppcanvas } - - class OutlineAction : public Action, public TextRenderer, @@ -1899,12 +1889,9 @@ namespace cppcanvas } - - // Action factory methods - /** Create an outline action This method extracts the polygonal outline from the @@ -2046,8 +2033,6 @@ namespace cppcanvas } // namespace - - ActionSharedPtr TextActionFactory::createTextAction( const ::Point& rStartPoint, const ::Size& rReliefOffset, const ::Color& rReliefColor, diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index f5f6203508c1..21a9ae4e0a18 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -43,7 +43,6 @@ namespace cppcanvas } - ImplSpriteCanvas::ImplSpriteCanvas( const uno::Reference< rendering::XSpriteCanvas >& rCanvas ) : ImplCanvas( uno::Reference< rendering::XCanvas >(rCanvas, uno::UNO_QUERY) ), diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 084e82b2f07f..6eaed4dec760 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -97,8 +97,6 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext() } - - class ThreadKey { bool _bInit; diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 92252ccb1ea4..c232bd14bf39 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -99,8 +99,6 @@ namespace cppu_threadpool } - - ThreadPool::ThreadPool() : m_DisposedCallerAdmin( DisposedCallerAdmin::getInstance() ) { @@ -370,7 +368,6 @@ struct uno_ThreadPool_Hash }; - typedef std::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet; static ThreadpoolHashSet *g_pThreadpoolHashSet; diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 4e80a2620918..2611ad4f7dab 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -90,7 +90,6 @@ static inline sal_Int32 newAlignedSize( } - namespace { struct typelib_StaticInitMutex : public rtl::Static< Mutex, typelib_StaticInitMutex > {}; diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index ee7ca0dad143..fc751ff1ba99 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -148,7 +148,6 @@ static inline sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass ) } - struct equalStr_Impl { bool operator()(const sal_Unicode * const & s1, const sal_Unicode * const & s2) const @@ -163,7 +162,6 @@ struct hashStr_Impl }; - // Heavy hack, the const sal_Unicode * is hold by the typedescription reference typedef std::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *, hashStr_Impl, equalStr_Impl > WeakMap_Impl; @@ -1096,7 +1094,6 @@ extern "C" void SAL_CALL typelib_typedescription_newMIInterface( } - namespace { typelib_TypeDescriptionReference ** copyExceptions( @@ -1197,7 +1194,6 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( } - extern "C" void SAL_CALL typelib_typedescription_newInterfaceAttribute( typelib_InterfaceAttributeTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, @@ -1284,7 +1280,6 @@ extern "C" void SAL_CALL typelib_typedescription_acquire( } - namespace { void deleteExceptions( @@ -1766,7 +1761,6 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( } - namespace { typelib_TypeDescriptionReference ** copyExceptions( diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index e016565aa7c9..5c6dc3202c9b 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -34,8 +34,6 @@ namespace cppu //#### assignment ################################################################################## - - inline void _assignInterface( void ** ppDest, void * pSource, uno_AcquireFunc acquire, uno_ReleaseFunc release ) diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 3033545637fb..69721566d9c2 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -173,7 +173,6 @@ extern "C" { static void SAL_CALL s_MediatorMapping_free(uno_Mapping * pMapping) }} - static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const & str2) { sal_Int32 nIndex1 = 0; diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index e6fd9abbcb66..1b77ce4e6d18 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -29,7 +29,6 @@ namespace cppu //#### construction ################################################################################ - void defaultConstructStruct( void * pMem, typelib_CompoundTypeDescription * pCompType ); diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index ab25e062b984..5f5b13878c9f 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -30,7 +30,6 @@ namespace cppu //#### copy construction ########################################################################### - inline uno_Sequence * allocSeq( sal_Int32 nElementSize, sal_Int32 nElements ) { diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 5ae29aedc6af..580620814b93 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -33,7 +33,6 @@ namespace cppu //#### destruction ################################################################################# - void destructStruct( void * pValue, typelib_CompoundTypeDescription * pTypeDescr, diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index 92acdcded26f..5a18e43dac19 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -32,7 +32,6 @@ namespace cppu //#### equality #################################################################################### - inline bool _equalObject( void * pI1, void * pI2, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 21f7cfde4b3b..55b126c1c7ca 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -819,7 +819,6 @@ ComponentContext::ComponentContext( } - extern "C" { static void s_createComponentContext_v(va_list * pParam) { ContextEntry_Init const * pEntries = va_arg(*pParam, ContextEntry_Init const *); diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 779e861374c0..f14494ffe01c 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -128,7 +128,6 @@ OSingleFactoryHelper::~OSingleFactoryHelper() } - Any OSingleFactoryHelper::queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) { diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index bd18e05decb1..b8b63041c6d0 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -155,7 +155,6 @@ public: }; - // class PropertySetHelper OPropertySetHelper::OPropertySetHelper( @@ -1225,5 +1224,4 @@ sal_Int32 OPropertyArrayHelper::fillHandles( sal_Int32 * pHandles, const Sequenc } // end namespace cppu - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx index 401610e0a4c6..e4c6edff61a9 100644 --- a/cppuhelper/source/tdmgr.cxx +++ b/cppuhelper/source/tdmgr.cxx @@ -562,7 +562,6 @@ static typelib_TypeDescription * createCTD( } - extern "C" { static void SAL_CALL typelib_callback( diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 82e279e82c2a..bef9b7ae63a0 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -174,7 +174,6 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference } - //-- OWeakObject ------------------------------------------------------- @@ -321,7 +320,6 @@ namespace uno { - //-- OWeakRefListener ----------------------------------------------------- class OWeakRefListener: public XReference, private boost::noncopyable diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx index 0a08b54bd559..2e239ad4864a 100644 --- a/cppuhelper/test/bootstrap/TestEnv.cxx +++ b/cppuhelper/test/bootstrap/TestEnv.cxx @@ -24,7 +24,6 @@ #include <cppu/helper/purpenv/Mapping.hxx> - #define LOG_LIFECYCLE_TestEnv #ifdef LOG_LIFECYCLE_TestEnv # include <iostream> diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx index 17d5d4eb9453..1f17ab63d89a 100644 --- a/cppuhelper/test/cfg_test.cxx +++ b/cppuhelper/test/cfg_test.cxx @@ -222,10 +222,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } - - - - SAL_IMPLEMENT_MAIN() { try diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx index a2a33d9f08cc..a24a5641de40 100644 --- a/cppuhelper/test/loader/loader.test.cxx +++ b/cppuhelper/test/loader/loader.test.cxx @@ -73,7 +73,6 @@ public: }; - static rtl::OUString s_test__cppu_loadSharedLibComponentFactory(char const * pServicePurpose) { rtl::OUString result; diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx index cca70c831a1b..1b4d7854cd21 100644 --- a/cppuhelper/test/testcmp/TestComponent.cxx +++ b/cppuhelper/test/testcmp/TestComponent.cxx @@ -18,7 +18,6 @@ */ - #define CPPUHELPER_TEST_COMPONENT_IMPL #include "TestComponent.hxx" diff --git a/cppuhelper/test/testdefaultbootstrapping.cxx b/cppuhelper/test/testdefaultbootstrapping.cxx index 2f459a4e79fc..8e80efa6c4b6 100644 --- a/cppuhelper/test/testdefaultbootstrapping.cxx +++ b/cppuhelper/test/testdefaultbootstrapping.cxx @@ -21,7 +21,6 @@ #include <sal/main.h> - #include <cstdio> #include <rtl/process.h> diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index b099d55bcbd1..3ff0ccd7d969 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -419,7 +419,6 @@ void throw_one( } - void test_ImplHelper( const Reference< lang::XMultiServiceFactory > & /*xSF*/ ) { Reference< XInterface > xImpl( (lang::XTypeProvider *)new TestImpl() ); diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index ad62cd95b44e..e18b5dbfa31c 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -145,7 +145,6 @@ static Property * getPropertyTable4() } - /********************** * * Note : all Property names must be in the 127 ASCII subset ! @@ -290,9 +289,6 @@ void test_PropertyArrayHelper() } - - - // test_OPropertySetHelper struct MutexContainer @@ -420,7 +416,6 @@ Property * getBasicProps() } - // test_OPropertySetHelper_Listener class test_OPropertySetHelper_Listener diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx index 6632c2dede9a..bfce879fecae 100644 --- a/cpputools/source/sp2bv/sp2bv.cxx +++ b/cpputools/source/sp2bv/sp2bv.cxx @@ -44,8 +44,6 @@ static bool hasOption(char const * szOption, int argc, char** argv); " Display help information.\n" - - int main(int argc, char **argv) { if( hasOption("--help",argc, argv) || hasOption("-h", argc, argv)) @@ -108,7 +106,6 @@ int main(int argc, char **argv) } - static bool hasOption(char const * szOption, int argc, char** argv) { bool retVal = false; @@ -124,7 +121,4 @@ static bool hasOption(char const * szOption, int argc, char** argv) } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 018cf392a196..525a7c89ba2f 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -4833,7 +4833,6 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt ) } - void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry ) { if ( pEntry != nullptr ) diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 0b6c87ad0e21..491571edd310 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -856,7 +856,6 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< fra } - IMPL_LINK_NOARG_TYPED(AssignComponentDialog, ButtonHandler, Button*, void) { OUString aMethodName = mpMethodEdit->GetText(); @@ -904,7 +903,6 @@ IMPL_LINK_NOARG_TYPED( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void } - SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "MacroAssignDialog", "cui/ui/macroassigndialog.ui") diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx index d8a0f731988b..a497db709446 100644 --- a/cui/source/dialogs/SpellAttrib.cxx +++ b/cui/source/dialogs/SpellAttrib.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::linguistic2; using namespace com::sun::star::uno; - SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rDesc ) @@ -34,7 +33,6 @@ SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) : } - SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) : TextAttrib(TEXTATTR_SPELL_ERROR), m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription ) diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 4a79b280cfc4..e1f55a3ad7b1 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -470,7 +470,6 @@ IMPL_LINK_NOARG_TYPED( SpellDialog, InitHdl, void*, void) }; - IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void ) { if (m_pOptionsPB == pBtn) @@ -568,7 +567,6 @@ OUString SpellDialog::getReplacementString() const } - IMPL_LINK_NOARG_TYPED(SpellDialog, DoubleClickChangeHdl, ListBox&, void) { ChangeHdl(nullptr); @@ -594,7 +592,6 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); @@ -755,7 +752,6 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, IgnoreHdl, Button*, void) } - bool SpellDialog::Close() { // We have to call ToggleChildWindow directly; calling SfxDispatcher's @@ -775,7 +771,6 @@ void SpellDialog::SetSelectedLang_Impl( LanguageType nLang ) } - LanguageType SpellDialog::GetSelectedLang_Impl() const { sal_Int16 nLang = m_pLanguageLB->GetSelectLanguage(); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6d865cd03a81..9449b13772a3 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -130,22 +130,18 @@ void SvxCharacterMap::SetChar( sal_UCS4 c ) } - sal_UCS4 SvxCharacterMap::GetChar() const { return m_pShowSet->GetSelectCharacter(); } - OUString SvxCharacterMap::GetCharacters() const { return m_pShowText->GetText(); } - - void SvxCharacterMap::DisableFontSelection() { m_pFontText->Disable(); @@ -268,7 +264,6 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void SvxShowText::SetFont( const vcl::Font& rFont ) { long nWinHeight = GetOutputSizePixel().Height(); @@ -299,7 +294,6 @@ void SvxShowText::Resize() } - void SvxShowText::SetText( const OUString& rText ) { Control::SetText( rText ); @@ -307,7 +301,6 @@ void SvxShowText::SetText( const OUString& rText ) } - // class SvxCharacterMap ================================================= void SvxCharacterMap::init() @@ -380,7 +373,6 @@ void SvxCharacterMap::init() } - void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) { // first get the underlying info in order to get font names @@ -399,7 +391,6 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, OKHdl, Button*, void) { OUString aStr = m_pShowText->GetText(); @@ -427,7 +418,6 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos(); @@ -480,7 +470,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) { const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos(); @@ -494,7 +483,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void) { if (bOne) @@ -506,7 +494,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) { if ( !bOne ) @@ -538,7 +525,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void) } - IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void) { OUString aText; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 6e06fd9c5815..88b1401a92cc 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -70,12 +70,6 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, } - - - - - - //# # //# Hyperlink - Dialog # //# # diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 575064151ff0..f4428f48a08b 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -75,7 +75,6 @@ void IconChoicePage::ActivatePage( const SfxItemSet& ) } - int IconChoicePage::DeactivatePage( SfxItemSet* ) { return LEAVE_PAGE; @@ -116,7 +115,6 @@ void IconChoicePage::ImplInitSettings() } - void IconChoicePage::StateChanged( StateChangedType nType ) { Window::StateChanged( nType ); @@ -129,7 +127,6 @@ void IconChoicePage::StateChanged( StateChangedType nType ) } - void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -143,11 +140,9 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) } - // Class IconChoiceDialog - /********************************************************************** | | Ctor / Dtor @@ -322,7 +317,6 @@ void IconChoiceDialog::ShowPageImpl ( IconChoicePageData* pData ) } - void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData ) { if ( pData->pPage ) @@ -427,7 +421,6 @@ IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(IconChoiceDialog, CancelHdl, Button*, void) { Close(); @@ -559,7 +552,6 @@ bool IconChoiceDialog::DeActivatePageImpl () } - void IconChoiceDialog::ResetPageImpl () { IconChoicePageData *pData = GetPageData ( mnCurrentPageId ); @@ -630,7 +622,6 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool ) } - void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) { bool bSet = ( pSet != nullptr ); @@ -645,14 +636,12 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet ) } - void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*/ ) { // not interested in } - SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 ) { SAL_INFO( "cui.dialogs", "CreateInputItemSet not implemented" ); @@ -677,7 +666,6 @@ short IconChoiceDialog::Execute() } - void IconChoiceDialog::Start( bool bShow ) { @@ -692,7 +680,6 @@ void IconChoiceDialog::Start( bool bShow ) } - bool IconChoiceDialog::QueryClose() { bool bRet = true; @@ -777,7 +764,6 @@ bool IconChoiceDialog::OK_Impl() } - short IconChoiceDialog::Ok() { bInOK = true; diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index f47208bef1c3..cd89c13714ff 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -100,7 +100,6 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OU } - IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, DoubleClickHdl, ListBox&, void) { EndDialog( RET_OK ); @@ -134,7 +133,6 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void) { if ( m_pRbNewObject->IsChecked() ) @@ -150,7 +148,6 @@ IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void) } - void SvInsertOleDlg::SelectDefault() { m_pLbObjecttype->SelectEntryPos(0); @@ -731,7 +728,6 @@ short SfxInsertFloatingFrameDialog::Execute() } - IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void ) { CheckBox* pCB = static_cast<CheckBox*>(pButton); @@ -753,7 +749,6 @@ IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void } - IMPL_LINK_NOARG_TYPED( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) { vcl::Window* pOldParent = Application::GetDefDialogParent(); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index bd1b07b11d2e..1a9a932494ac 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -183,6 +183,4 @@ bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index d0a7c5c8e345..d5c1f4474ac9 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -120,7 +120,6 @@ SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSe } - SvxPostItDialog::~SvxPostItDialog() { disposeOnce(); @@ -141,7 +140,6 @@ void SvxPostItDialog::dispose() } - void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) { OUString sTxt( rAuthor ); @@ -151,7 +149,6 @@ void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rD } - const sal_uInt16* SvxPostItDialog::GetRanges() { static const sal_uInt16 pRanges[] = @@ -164,7 +161,6 @@ const sal_uInt16* SvxPostItDialog::GetRanges() } - void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) { m_pPrevBtn->Enable(bPrev); @@ -172,7 +168,6 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) } - IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void) { aPrevHdlLink.Call( *this ); @@ -211,7 +206,6 @@ IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxPostItDialog, OKHdl, Button*, void) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index a27a8f189047..af592f6a1f47 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -174,7 +174,6 @@ IMPL_LINK_TYPED( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void ) } - void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); @@ -1591,7 +1590,6 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Wind } - SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( vcl::Window* pParent ) { return new AbstractPasteDialog_Impl( VclPtr<SvPasteObjectDialog>::Create( pParent ) ); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 6c7d73fb9452..5bb412c6a611 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -50,7 +50,6 @@ namespace svx { - class AlignmentTabPage : public SfxTabPage { using TabPage::DeactivatePage; @@ -114,7 +113,6 @@ private: }; - } #endif diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index f67e51e38532..47bc3a0f4c86 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -51,7 +51,6 @@ public: }; - /************************************************************************* |* |* Hyperlink-Dialog diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 24c4a6ce2666..095b961ceca7 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -25,7 +25,6 @@ #include <vcl/field.hxx> - class FmInputRecordNoDialog : public ModalDialog { public: diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 76c979e55601..ac09a3d91bbd 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -151,7 +151,6 @@ public: }; - #endif // INCLUDED_CUI_SOURCE_INC_DLGNAME_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 5ada9262ba37..df61c578320f 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CUI_SOURCE_INC_NUMFMT_HXX - #include <rtl/ustring.hxx> #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> @@ -34,13 +33,11 @@ #include <vcl/window.hxx> - class SvxNumberFormatShell; class SvxNumberInfoItem; class vector; - class SvxNumberPreview : public vcl::Window { private: @@ -62,7 +59,6 @@ public: }; - class SvxNumberFormatTabPage : public SfxTabPage { friend class VclPtr<SvxNumberFormatTabPage>; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index cea7ac040f5c..b29e32993ea7 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -79,7 +79,6 @@ struct SvxNumSettings_Impl typedef std::vector<std::unique_ptr<SvxNumSettings_Impl> > SvxNumSettingsArr_Impl; - class SvxSingleNumPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -116,8 +115,6 @@ public: }; - - class SvxBulletPickTabPage : public SfxTabPage { using TabPage::ActivatePage; @@ -200,7 +197,6 @@ public: }; - class SvxBitmapPickTabPage : public SfxTabPage { using TabPage::ActivatePage; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index b0082525273e..87363297f0fe 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -25,7 +25,6 @@ #include <memory> - struct PasswordToOpenModifyDialog_Impl; class PasswordToOpenModifyDialog : public SfxModalDialog @@ -49,7 +48,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 69605d713eb6..807297ae66fb 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -99,7 +99,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage bool m_bIsInRightToLeft; - DECL_LINK_TYPED(RangeModifyHdl, Control&, void); DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 3490963393f5..f56ee4eec014 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -274,7 +274,6 @@ public: }; - #endif // INCLUDED_CUI_SOURCE_INC_TRANSFRM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 727e88bdf32b..91c9295939ec 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -311,8 +311,6 @@ void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const } - - void SvxChartColorTableItem::ReplaceColorByIndex( size_t _nIndex, const XColorEntry & _rEntry ) { m_aColorTable.replace( _nIndex, _rEntry ); diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index c3a4cee060c0..56ff7d3b88a9 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -199,5 +199,4 @@ namespace offapp } // namespace offapp - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 17e8a27386cc..de64d355aac6 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -81,10 +81,7 @@ namespace offapp } - - } // namespace offapp - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index cd439f268497..f0d16513d245 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -160,7 +160,6 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons } - DbRegistrationOptionsPage::~DbRegistrationOptionsPage() { disposeOnce(); @@ -179,7 +178,6 @@ void DbRegistrationOptionsPage::dispose() } - VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { @@ -187,7 +185,6 @@ VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent, } - bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) { // the settings for the single drivers @@ -215,7 +212,6 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) } - void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) { // the settings for the single drivers @@ -314,7 +310,6 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) } - IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -344,7 +339,6 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, } - IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { assert(pBar); @@ -451,5 +445,4 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, NameValidator, const OUString&, _rNa } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index 18a8680518b1..cd612bd78635 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -52,10 +52,7 @@ namespace svx } - - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index db5a7ea95fae..8cf570209775 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -39,7 +39,6 @@ public: }; - void OptLBoxString_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index d743156bbc4f..38a9d4704ece 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -172,8 +172,6 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) } - - // event handlers diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 825ee32cf82e..31564763122f 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -499,7 +499,6 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor) } - // ColorConfigWindow_Impl @@ -1040,7 +1039,6 @@ IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) }; - // SvxColorOptionsTabPage diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 929179ee96cf..f7fea6094d57 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -204,7 +204,6 @@ IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, ModifyHdl_Impl, Edit&, void) { if ( !pNameEdit->GetText().isEmpty() ) @@ -383,7 +382,6 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl( } - void SvxEditDictionaryDialog::SetLanguage_Impl( util::Language nLanguage ) { // select language @@ -430,7 +428,6 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) } - IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) { sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos(); @@ -454,7 +451,6 @@ IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, voi } - IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) { sal_Int32 nDicPos = pAllDictsLB->GetSelectEntryPos(); @@ -488,7 +484,6 @@ IMPL_LINK_NOARG_TYPED(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, voi } - void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) { Reference< XDictionary > xDic = aDics.getConstArray()[ nId ]; @@ -560,7 +555,6 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) } - IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) { if(!bDoNothing) @@ -586,7 +580,6 @@ IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) }; - IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelButtonHdl, Button*, pBtn, void) { NewDelHdl(static_cast<PushButton*>(pBtn)); @@ -693,7 +686,6 @@ bool SvxEditDictionaryDialog::NewDelHdl(void* pBtn) } - IMPL_LINK_TYPED(SvxEditDictionaryDialog, ModifyHdl, Edit&, rEdt, void) { OUString rEntry = rEdt.GetText(); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 08a5eef252b9..b990d188e0ef 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -37,7 +37,6 @@ enum MSFltrPg2_CheckBoxEntries { }; - OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet ) { diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 07a26a5c143f..a5d410ee2170 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1600,7 +1600,6 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) m_pWesternLanguageLB->Enable( bEnable ); - // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl #if 0 bEnable = ( !pLangConfig->aLinguConfig.IsReadOnly( "DefaultLocale_CJK" ) && m_pAsianSupportCB->IsChecked() ); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 7de37b318247..aff31a26d53b 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -154,8 +154,6 @@ const vFieldInfo[] = } // namespace - - // Row struct SvxGeneralTabPage::Row @@ -179,8 +177,6 @@ public: }; - - // Field struct SvxGeneralTabPage::Field @@ -205,7 +201,6 @@ public: }; - SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet) @@ -286,7 +281,6 @@ void SvxGeneralTabPage::InitControls () } - void SvxGeneralTabPage::SetLinks () { // link for updating the initials @@ -297,7 +291,6 @@ void SvxGeneralTabPage::SetLinks () } - VclPtr<SfxTabPage> SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return VclPtr<SvxGeneralTabPage>::Create( pParent, *rAttrSet ); @@ -343,7 +336,6 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) } - // ModifyHdl_Impl() // This handler updates the initials (short name) // when one of the name fields was updated. @@ -380,7 +372,6 @@ IMPL_LINK_TYPED( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void ) } - bool SvxGeneralTabPage::GetAddress_Impl() { // updating @@ -399,7 +390,6 @@ bool SvxGeneralTabPage::GetAddress_Impl() } - void SvxGeneralTabPage::SetAddress_Impl() { // updating and disabling edit boxes @@ -429,7 +419,6 @@ void SvxGeneralTabPage::SetAddress_Impl() } - SvxGeneralTabPage::sfxpg SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ ) { if ( pSet_ ) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index ee3f151516ab..f60a831d3523 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -66,5 +66,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index abfff4ba14bd..a4960e8cf54a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -119,7 +119,6 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) } - void SvxNoSpaceEdit::Modify() { Edit::Modify(); @@ -524,7 +523,6 @@ void SvxProxyTabPage::EnableControls_Impl(bool bEnable) } - IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -539,7 +537,6 @@ IMPL_LINK_TYPED( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) } - IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) { Edit* pEdit = static_cast<Edit*>(&rControl); @@ -550,7 +547,6 @@ IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, } - void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) { // try to show tips just like as on toolbars sal_Int32 nPos=LISTBOX_ENTRY_NOTFOUND; @@ -1091,5 +1087,4 @@ IMPL_LINK_TYPED( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index bdb111023c0f..1b1a0ef97c1d 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -199,7 +199,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& } - SvxJavaOptionsPage::~SvxJavaOptionsPage() { disposeOnce(); @@ -235,7 +234,6 @@ void SvxJavaOptionsPage::dispose() } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) { bool bEnable = m_pJavaEnableCB->IsChecked(); @@ -244,7 +242,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pJavaList->GetEntry( m_pJavaList->GetCurMousePoint() ) @@ -254,7 +251,6 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) { // set installation directory info @@ -269,7 +265,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) { try @@ -294,7 +289,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA @@ -344,7 +338,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA @@ -390,14 +383,12 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) { LoadJREs(); } - IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) { try @@ -415,7 +406,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, StartFolderPickerHdl, void*, void) } - IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if ( RET_OK == pEvt->DialogResult ) @@ -427,7 +417,6 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, } - IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) { ScopedVclPtrInstance< CuiAboutConfigTabPage > m_pExpertConfigDlg(this); @@ -442,7 +431,6 @@ IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) } - void SvxJavaOptionsPage::ClearJavaInfo() { #if HAVE_FEATURE_JAVA @@ -465,7 +453,6 @@ void SvxJavaOptionsPage::ClearJavaInfo() } - void SvxJavaOptionsPage::ClearJavaList() { SvTreeListEntry* pEntry = m_pJavaList->First(); @@ -479,7 +466,6 @@ void SvxJavaOptionsPage::ClearJavaList() } - void SvxJavaOptionsPage::LoadJREs() { #if HAVE_FEATURE_JAVA @@ -527,7 +513,6 @@ void SvxJavaOptionsPage::LoadJREs() } - void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) { #if HAVE_FEATURE_JAVA @@ -550,7 +535,6 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) } - void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) { m_pJavaList->Select( _pEntry ); @@ -572,7 +556,6 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) } - void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) { #if HAVE_FEATURE_JAVA @@ -648,14 +631,12 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) } - VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return VclPtr<SvxJavaOptionsPage>::Create( pParent, *rAttrSet ); } - bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) { bool bModified = false; @@ -759,7 +740,6 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) } - void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { ClearJavaInfo(); @@ -788,7 +768,6 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) } - void SvxJavaOptionsPage::FillUserData() { OUString aUserData; @@ -841,7 +820,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, ModifyHdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); @@ -865,7 +843,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, SelectHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); @@ -874,7 +851,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); @@ -902,7 +878,6 @@ short SvxJavaParameterDlg::Execute() } - Sequence< OUString > SvxJavaParameterDlg::GetParameters() const { sal_Int32 nCount = m_pAssignedList->GetEntryCount(); @@ -914,7 +889,6 @@ Sequence< OUString > SvxJavaParameterDlg::GetParameters() const } - void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) { m_pAssignedList->Clear(); @@ -949,7 +923,6 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent) } - SvxJavaClassPathDlg::~SvxJavaClassPathDlg() { disposeOnce(); @@ -1006,7 +979,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -1042,7 +1014,6 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pPathList->GetSelectEntryPos(); @@ -1062,14 +1033,12 @@ IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, SelectHdl_Impl, ListBox&, void) { EnableRemoveButton(); } - bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath ) { bool bRet = false; @@ -1089,7 +1058,6 @@ bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath ) } - OUString SvxJavaClassPathDlg::GetClassPath() const { OUString sPath; @@ -1108,7 +1076,6 @@ OUString SvxJavaClassPathDlg::GetClassPath() const } - void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath ) { if ( m_sOldPath.isEmpty() ) diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 9ef64992a245..60fd15bbdea8 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -26,7 +26,6 @@ using namespace com::sun::star::i18n; - SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", &rSet ) { diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index eb58df0a09a4..b64ef76d330b 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -28,7 +28,6 @@ namespace vcl { class Window; } class SfxItemSet; - class SvxJSearchOptionsPage : public SfxTabPage { private: @@ -75,7 +74,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 55f0d2e3abd3..c9084b3b4b0c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -631,8 +631,6 @@ ServiceInfo_Impl * SvxLinguData_Impl::GetInfoByImplName( const OUString &rSvcImp } - - static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd) { const Locale* pAdd = rAdd.getConstArray(); @@ -1217,7 +1215,6 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet ) } - // activate dictionaries according to checkbox state Sequence< OUString > aActiveDics; @@ -1359,7 +1356,6 @@ void SvxLinguTabPage::AddDicBoxEntry( } - void SvxLinguTabPage::UpdateDicBox_Impl() { m_pLinguDicsCLB->SetUpdateMode(false); @@ -1378,7 +1374,6 @@ void SvxLinguTabPage::UpdateDicBox_Impl() } - void SvxLinguTabPage::UpdateModulesBox_Impl() { if (pLinguData) @@ -1401,7 +1396,6 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() } - void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) { // if not HideGroups was called with GROUP_MODULES... @@ -1413,7 +1407,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) } - // get data from configuration @@ -1512,7 +1505,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) } - IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool ) { if (pBox == m_pLinguModulesCLB) @@ -1531,14 +1523,12 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, } - IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void) { ClickHdl_Impl(m_pLinguModulesEditPB); } - IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); @@ -1546,7 +1536,6 @@ IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void) } - IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void ) { if (pBox == m_pLinguModulesCLB) @@ -1576,7 +1565,6 @@ IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, } - IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) { if (m_pLinguModulesEditPB == pBtn) @@ -1756,7 +1744,6 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) } - IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pLinguModulesCLB == pBox) @@ -1790,7 +1777,6 @@ IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) } - SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) { SvTreeListEntry* pEntry = new SvTreeListEntry; @@ -1813,7 +1799,6 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) } - void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) { if ( 0 != ( GROUP_MODULES & nGrp ) ) @@ -2309,7 +2294,6 @@ IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, OpenURLHdl_Impl, FixedHyperlink&, void) { OUString sURL( m_pMoreDictsLink->GetURL() ); diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 8cd429800169..be9f9111f06f 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -110,7 +110,6 @@ SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) } - OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet) { @@ -208,7 +207,6 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) } - void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index e88a44ae17b8..b07ce78940dd 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -238,7 +238,6 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) } - SvxPathTabPage::~SvxPathTabPage() { disposeOnce(); @@ -279,7 +278,6 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) } - void SvxPathTabPage::Reset( const SfxItemSet* ) { pPathBox->Clear(); @@ -378,7 +376,6 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) } - void SvxPathTabPage::FillUserData() { HeaderBar &rBar = pPathBox->GetTheHeaderBar(); @@ -391,7 +388,6 @@ void SvxPathTabPage::FillUserData() } - IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) { sal_uInt16 nSelCount = 0; @@ -413,7 +409,6 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) } - IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->FirstSelected(); @@ -480,7 +475,6 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) } - void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); @@ -544,7 +538,6 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) } - IMPL_LINK_NOARG_TYPED(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool) { PathHdl_Impl(nullptr); @@ -675,7 +668,6 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE) @@ -703,7 +695,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) } - IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if (!pBar || !pBar->GetCurItemId()) @@ -733,7 +724,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) } - IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void ) { if ( RET_OK == pEvt->DialogResult ) @@ -746,7 +736,6 @@ IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void } - void SvxPathTabPage::GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ) @@ -812,7 +801,6 @@ void SvxPathTabPage::GetPathList( } - void SvxPathTabPage::SetPathList( sal_uInt16 _nPathHandle, const OUString& _rUserPath, const OUString& _rWritablePath ) { diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index d3448524014e..e1b63cee99a7 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -54,7 +54,6 @@ using namespace comphelper; #define CFG_PAGE_AND_GROUP "General", "LoadSave" - struct SvxSaveTabPage_Impl { Reference< XNameContainer > xFact; @@ -195,7 +194,6 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet } - SvxSaveTabPage::~SvxSaveTabPage() { disposeOnce(); @@ -512,7 +510,6 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) } - IMPL_LINK_TYPED( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void ) { if ( pBox == aAutoSaveCB ) diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index ae2e1537e79e..ba0ade2bf883 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -97,5 +97,4 @@ namespace offapp } // namespace offapp - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 3832cd0f7086..aac518d4084a 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -91,7 +91,6 @@ static const RotateModeConnection::MapEntryType s_pRotateModeMap[] = }; - const sal_uInt16 AlignmentTabPage::s_pRanges[] = { SID_ATTR_ALIGN_HOR_JUSTIFY,SID_ATTR_ALIGN_VER_JUSTIFY, @@ -107,7 +106,6 @@ const sal_uInt16 AlignmentTabPage::s_pRanges[] = }; - namespace { template<typename _JustContainerType, typename _JustEnumType> @@ -149,7 +147,6 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const }//namespace - AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", &rCoreAttrs ) @@ -441,7 +438,6 @@ IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableHdl, ListBox&, void) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index cf7af4a9cc8e..d0e7a5d6ac17 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2157,7 +2157,6 @@ IMPL_LINK_TYPED( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void ) } - OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) { if (!cChar) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 1c3f2a5ea1fe..1857a9f8c560 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -396,7 +396,6 @@ bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 nStyle ) const } - void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) { SfxTabPage::Reset( rSet ); @@ -617,7 +616,6 @@ SfxTabPage::sfxpg SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); @@ -769,14 +767,12 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) } - void SvxBorderTabPage::HideShadowControls() { m_pShadowFrame->Hide(); } - IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) { const svx::FrameBorderState SHOW = svx::FRAMESTATE_SHOW; @@ -847,7 +843,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) } - IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) { bool bEnable = m_pWndShadows->GetSelectItemId() > 1; @@ -858,7 +853,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void) } - IMPL_LINK_TYPED( SvxBorderTabPage, SelColHdl_Impl, ListBox&, rLb, void ) { ColorListBox* pColLb = static_cast<ColorListBox*>(&rLb); @@ -883,7 +877,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, ModifyWidthHdl_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxBorderTabPage, SelStyleHdl_Impl, ListBox&, rLb, void ) { if (&rLb == m_pLbLineStyle) @@ -908,7 +901,6 @@ const sal_uInt16 SVX_BORDER_PRESET_COUNT = 5; const sal_uInt16 SVX_BORDER_SHADOW_COUNT = 5; - sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const { // table with all sets of predefined border styles @@ -976,7 +968,6 @@ sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const } - void SvxBorderTabPage::FillPresetVS() { ImageList& rImgList = aBorderImgLst; @@ -999,7 +990,6 @@ void SvxBorderTabPage::FillPresetVS() } - void SvxBorderTabPage::FillShadowVS() { ImageList& rImgList = aShadowImgLst; @@ -1029,7 +1019,6 @@ void SvxBorderTabPage::FillShadowVS() } - void SvxBorderTabPage::FillValueSets() { FillPresetVS(); @@ -1176,7 +1165,6 @@ IMPL_LINK_NOARG_TYPED(SvxBorderTabPage, LinesChanged_Impl, LinkParamNone*, void) } - IMPL_LINK_TYPED( SvxBorderTabPage, ModifyDistanceHdl_Impl, Edit&, rField, void) { if ( mbSync ) diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index a1e6b06ffb7c..aecef5b2be2d 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -264,8 +264,6 @@ ShadowConnection::ShadowConnection( const SfxItemSet& rItemSet, } - - sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot, FrameSelector& rFrameSel, FrameBorderType eBorder, sfx::ItemConnFlags nFlags ) { @@ -288,7 +286,6 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx index 1761fe5479ee..466c631709f9 100644 --- a/cui/source/tabpages/borderconn.hxx +++ b/cui/source/tabpages/borderconn.hxx @@ -33,7 +33,6 @@ namespace svx { class FrameSelector; - /** Creates an item connection object that connects an SvxLineItem with an svx::FrameSelector control. */ sfx::ItemConnectionBase* CreateFrameLineConnection( sal_uInt16 nSlot, @@ -54,7 +53,6 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet, sfx::ItemConnFlags nFlags = sfx::ITEMCONN_DEFAULT ); - } #endif diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 9e47e2469dd1..5ac913d806a9 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -161,7 +161,6 @@ inline SvxFont& SvxCharBasePage::GetPreviewFont() } - inline SvxFont& SvxCharBasePage::GetPreviewCJKFont() { return m_pPreviewWin->GetCJKFont(); @@ -174,7 +173,6 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() } - SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset ) , m_pPreviewWin(nullptr) @@ -200,8 +198,6 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet ) } - - void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); @@ -375,7 +371,6 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet } - SvxCharNamePage::~SvxCharNamePage() { disposeOnce(); @@ -441,7 +436,6 @@ void SvxCharNamePage::Initialize() } - const FontList* SvxCharNamePage::GetFontList() const { if ( !m_pImpl->m_pFontList ) @@ -543,7 +537,6 @@ namespace } - void SvxCharNamePage::UpdatePreview_Impl() { SvxFont& rFont = GetPreviewFont(); @@ -581,7 +574,6 @@ void SvxCharNamePage::UpdatePreview_Impl() } - void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) { const FontList* pFontList = GetFontList(); @@ -618,7 +610,6 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox ) } - void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) { const FontList* pFontList = GetFontList(); @@ -653,7 +644,6 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox ) } - void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ) { FontNameBox* pNameBox = nullptr; @@ -1175,14 +1165,12 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp } - IMPL_LINK_NOARG_TYPED(SvxCharNamePage, UpdateHdl_Impl, Idle *, void) { UpdatePreview_Impl(); } - IMPL_LINK_TYPED( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void ) { FontModifyHdl_Impl(&rBox); @@ -1207,7 +1195,6 @@ void SvxCharNamePage::FontModifyHdl_Impl(void* pNameBox) } - void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) { SvxCharBasePage::ActivatePage( rSet ); @@ -1216,7 +1203,6 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -1225,14 +1211,12 @@ SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharNamePage>::Create( pParent, *rSet ); } - void SvxCharNamePage::Reset( const SfxItemSet* rSet ) { Reset_Impl( *rSet, Western ); @@ -1267,7 +1251,6 @@ bool SvxCharNamePage::FillItemSet( SfxItemSet* rSet ) } - void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem ) { if ( m_pImpl->m_bMustDelete ) @@ -1308,7 +1291,6 @@ void SvxCharNamePage::EnableRelativeMode() } - void SvxCharNamePage::EnableSearchMode() { m_pImpl->m_bInSearchMode = true; @@ -1596,7 +1578,6 @@ void SvxCharEffectsPage::UpdatePreview_Impl() } - void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) { if ( SVX_CASEMAP_END > eCaseMap ) @@ -1612,7 +1593,6 @@ void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) } - void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); @@ -1670,7 +1650,6 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet ) } - bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) { sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_COLOR ); @@ -1711,7 +1690,6 @@ bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet ) } - IMPL_LINK_TYPED( SvxCharEffectsPage, SelectListBoxHdl_Impl, ListBox&, rBox, void ) { SelectHdl_Impl(&rBox); @@ -1748,7 +1726,6 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox ) } - IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) { bool bEnable = ( ( m_pUnderlineLB->GetSelectEntryPos() > 0 ) || @@ -1760,21 +1737,18 @@ IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } - IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); } - IMPL_LINK_TYPED( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ListBox&, rListBox, void ) { ColorListBox* pBox = static_cast<ColorListBox*>(&rListBox); @@ -1803,14 +1777,12 @@ SfxTabPage::sfxpg SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharEffectsPage>::Create( pParent, *rSet ); } - void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) { SvxFont& rFont = GetPreviewFont(); @@ -2748,7 +2720,6 @@ void SvxCharPositionPage::UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscPro } - void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) { SvxEscapementItem aEscItm( (SvxEscapement)nEsc, SID_ATTR_CHAR_ESCAPEMENT ); @@ -2796,7 +2767,6 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) } - IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) { sal_uInt16 nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL @@ -2810,7 +2780,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) } - IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) { bool bEnable = false; @@ -2822,7 +2791,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) { sal_uInt8 nEscProp = (sal_uInt8)m_pFontSizeMF->GetValue(); @@ -2832,7 +2800,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, FontModifyHdl_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void ) { if ( static_cast<CheckBox*>(pBox)->IsChecked() ) @@ -2847,7 +2814,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void } - IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) { if (m_pFitToLineCB == pBox) @@ -2862,7 +2828,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningSelectHdl_Impl, ListBox&, void) { if ( m_pKerningLB->GetSelectEntryPos() > LW_NORMAL ) @@ -2895,7 +2860,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningSelectHdl_Impl, ListBox&, void } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) { long nVal = static_cast<long>(m_pKerningMF->GetValue()); @@ -2917,7 +2881,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, KerningModifyHdl_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, void ) { MetricField* pField = static_cast<MetricField*>(&rControl); @@ -2942,7 +2905,6 @@ IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, voi } - IMPL_LINK_NOARG_TYPED(SvxCharPositionPage, ScaleWidthModifyHdl_Impl, Edit&, void) { m_pPreviewWin->SetFontWidthScale( sal_uInt16( m_pScaleWidthMF->GetValue() ) ); @@ -2967,7 +2929,6 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -2976,14 +2937,12 @@ SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharPositionPage>::Create( pParent, *rSet ); } - void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) { OUString sUser = GetUserData(); @@ -3370,7 +3329,6 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet ) } - void SvxCharPositionPage::FillUserData() { const OUString cTok( ";" ); @@ -3449,7 +3407,6 @@ void SvxCharTwoLinesPage::Initialize() } - void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) { bool bStart = pBox == m_pStartBracketLB; @@ -3468,7 +3425,6 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) } - void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) { sal_Int32 nEntryPos = 0; @@ -3506,7 +3462,6 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) } - IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) { bool bChecked = m_pTwoLinesBtn->IsChecked(); @@ -3516,7 +3471,6 @@ IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void ) { sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -3534,14 +3488,12 @@ IMPL_LINK_TYPED( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void } - void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet ) { SvxCharBasePage::ActivatePage( rSet ); } - SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) @@ -3550,7 +3502,6 @@ SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) } - VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxCharTwoLinesPage>::Create( pParent, *rSet ); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 55cb3b301cf9..da590149f576 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -165,7 +165,6 @@ void SvxCaptionTabPage::Construct() } - bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) { SfxItemPool* pPool = _rOutAttrs->GetPool(); @@ -237,7 +236,6 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) } - void SvxCaptionTabPage::Reset( const SfxItemSet* ) { @@ -355,7 +353,6 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { @@ -363,7 +360,6 @@ VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow, } - void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) { switch( nType ) @@ -421,7 +417,6 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType ) } - IMPL_LINK_TYPED( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void ) { if (&rListBox == m_pLB_ANSATZ) @@ -456,7 +451,6 @@ IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) } - IMPL_LINK_NOARG_TYPED(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void) { SetupType_Impl( m_pCT_CAPTTYPE->GetSelectItemId() ); @@ -493,7 +487,6 @@ void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType ) } - void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) { SfxTabPage::DataChanged( rDCEvt ); @@ -503,7 +496,6 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt ) } - void SvxCaptionTabPage::FillValueSet() { m_pCT_CAPTTYPE->SetItemImage(BMP_CAPTTYPE_1, m_aBmpCapTypes[0] ); @@ -512,8 +504,6 @@ void SvxCaptionTabPage::FillValueSet() } - - SvxCaptionTabDialog::SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pSdrView, sal_uInt16 nAnchorTypes) : SfxTabDialog( pParent, "CalloutDialog", "cui/ui/calloutdialog.ui") diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 72d79a7cb287..f0b3255373c3 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -199,7 +199,6 @@ void SvxNumberPreview::InitSettings( bool bForeground, bool bBackground ) } - void SvxNumberPreview::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::ControlForeground ) @@ -211,7 +210,6 @@ void SvxNumberPreview::StateChanged( StateChangedType nType ) } - void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -933,7 +931,6 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa } - if ( nCategory != nCurCategory || bDoIt) { if ( bCheckCatChange ) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index dc7905706b34..a9038c0a3dba 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -89,7 +89,6 @@ const sal_uInt16 aArr[] = }; - sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) { for ( sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aArr); ++i ) @@ -99,7 +98,6 @@ sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage ) } - sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) { if ( nPos >= SAL_N_ELEMENTS(aArr) ) @@ -108,7 +106,6 @@ sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos ) } - Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBox ) { Size aSz; @@ -120,7 +117,6 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo } - long ConvertLong_Impl( const long nIn, SfxMapUnit eUnit ) { return OutputDevice::LogicToLogic( nIn, (MapUnit)eUnit, MAP_TWIP ); @@ -140,7 +136,6 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize ) } - #define MARGIN_LEFT ( (MarginPosition)0x0001 ) #define MARGIN_RIGHT ( (MarginPosition)0x0002 ) #define MARGIN_TOP ( (MarginPosition)0x0004 ) @@ -362,7 +357,6 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr } - SvxPageDescPage::~SvxPageDescPage() { disposeOnce(); @@ -408,7 +402,6 @@ void SvxPageDescPage::dispose() } - void SvxPageDescPage::Init_Impl() { // adjust the handler @@ -442,7 +435,6 @@ void SvxPageDescPage::Init_Impl() } - void SvxPageDescPage::Reset( const SfxItemSet* rSet ) { SfxItemPool* pPool = rSet->GetPool(); @@ -693,7 +685,6 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) } - void SvxPageDescPage::FillUserData() { if ( SVX_PAGE_MODE_PRESENTATION == eMode ) @@ -702,7 +693,6 @@ void SvxPageDescPage::FillUserData() } - bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) { bool bModified = false; @@ -926,7 +916,6 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) { // switch inside outside @@ -950,7 +939,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) { if ( m_pPaperTrayBox->GetEntryCount() > 1 ) @@ -985,7 +973,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) } - IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) { const sal_Int32 nPos = rBox.GetSelectEntryPos(); @@ -1056,7 +1043,6 @@ IMPL_LINK_TYPED( SvxPageDescPage, PaperSizeSelect_Impl, ListBox&, rBox, void ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) { sal_uInt16 nWhich = GetWhich( SID_ATTR_LRSPACE ); @@ -1080,7 +1066,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperSizeModify_Impl, Edit&, void) } - IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) { if ( @@ -1108,7 +1093,6 @@ IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) } - void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) { MapMode aOldMode = mpDefPrinter->GetMapMode(); @@ -1176,7 +1160,6 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, BorderModify_Impl, Edit&, void) { if ( !bBorderModified ) @@ -1206,7 +1189,6 @@ void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) } - void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) { sal_uInt16 nWhich(GetWhich(SID_ATTR_PAGE_HEADERSET)); @@ -1464,7 +1446,6 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) } - void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) { InitHeadFoot_Impl( rSet ); @@ -1474,7 +1455,6 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) { // Inquiry whether the page margins are beyond the printing area. @@ -1528,7 +1508,6 @@ SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) { // example window @@ -1596,7 +1575,6 @@ IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) } - void SvxPageDescPage::CalcMargin_Impl() { // current values for page margins @@ -1639,7 +1617,6 @@ void SvxPageDescPage::CalcMargin_Impl() } - IMPL_LINK_NOARG_TYPED(SvxPageDescPage, CenterHdl_Impl, Button*, void) { m_pBspWin->SetHorz( m_pHorzBox->IsChecked() ); @@ -1662,7 +1639,6 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) } - IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void ) { bool bEnable = false; @@ -1677,7 +1653,6 @@ IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void ) } - void SvxPageDescPage::DisableVerticalPageDir() { m_pTextFlowBox->RemoveEntryValue( FRMDIR_VERT_TOP_RIGHT ); diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 73961af035ea..6a6ce0394e69 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -222,7 +222,6 @@ short SvxAreaTabDialog::Ok() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 20b3da921466..4db2bbc5d979 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -103,7 +103,6 @@ SvxLineTabDialog::SvxLineTabDialog } - void SvxLineTabDialog::SavePalettes() { SfxObjectShell* pShell = SfxObjectShell::Current(); @@ -171,7 +170,6 @@ void SvxLineTabDialog::SavePalettes() } - short SvxLineTabDialog::Ok() { SavePalettes(); @@ -182,7 +180,6 @@ short SvxLineTabDialog::Ok() } - IMPL_LINK_NOARG_TYPED(SvxLineTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index baa7ee275758..93833063cca0 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -692,7 +692,6 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs pMainFrame->set_height_request(aMainFrame.Height()); - // groups that overlay each other m_pLbBitmap->Hide(); m_pCtlBitmapPreview->Hide(); @@ -847,7 +846,6 @@ void SvxAreaTabPage::Construct() } - void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_Int32 nCount(0); @@ -996,7 +994,6 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( m_nDlgType == 0 ) // area dialog @@ -1048,7 +1045,6 @@ SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) { sal_Int32 _nPos; @@ -1493,7 +1489,6 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) } - void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) { bool isMissingHatching(false); @@ -1851,7 +1846,6 @@ VclPtr<SfxTabPage> SvxAreaTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, SelectDialogTypeHdl_Impl, ListBox&, void) { switch( (drawing::FillStyle)m_pTypeLB->GetSelectEntryPos() ) @@ -1888,7 +1882,6 @@ void SvxAreaTabPage::ClickInvisibleHdl_Impl() } - void SvxAreaTabPage::ClickColorHdl_Impl() { m_pBxBitmap->Hide(); @@ -1912,7 +1905,6 @@ void SvxAreaTabPage::ClickColorHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyColorHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -1966,7 +1958,6 @@ void SvxAreaTabPage::ClickGradientHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -1992,7 +1983,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyGradientHdl_Impl, ListBox&, void) } - void SvxAreaTabPage::ClickHatchingHdl_Impl() { m_pFillLB->Show(); @@ -2020,7 +2010,6 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -2046,7 +2035,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchingHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, ListBox&, void) { const SfxPoolItem* pPoolItem = nullptr; @@ -2069,7 +2057,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl, ListBox&, } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl, CheckBox&, void) { // switch on/off backgroundcolor for hatches @@ -2092,7 +2079,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl, CheckBox&, } - void SvxAreaTabPage::ClickBitmapHdl_Impl() { m_pFillLB->Show(); @@ -2139,7 +2125,6 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl() } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) { //UUUU @@ -2170,7 +2155,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyBitmapHdl_Impl, ListBox&, void) } - IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountClickHdl_Impl, Button*, p, void ) { ModifyStepCountHdl_Impl(p); @@ -2400,7 +2384,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileHdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void) { if( m_pTsbScale->GetState() == TRISTATE_TRUE ) @@ -2436,7 +2419,6 @@ IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void) } - void SvxAreaTabPage::PointChanged( vcl::Window* , RECT_POINT eRcPt ) { m_eRP = eRcPt; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 460fef5b15a9..335b03a50575 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -152,7 +152,6 @@ void SvxBitmapTabPage::Construct() } - void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) { sal_Int32 nPos; @@ -230,7 +229,6 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) { if ( CheckChanges_Impl() == -1L ) @@ -243,7 +241,6 @@ SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) } - bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) { if( m_nDlgType == 0 && !*m_pbAreaTP ) // area dialog @@ -272,7 +269,6 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) } - void SvxBitmapTabPage::Reset( const SfxItemSet* ) { // aLbBitmaps.SelectEntryPos( 0 ); @@ -307,7 +303,6 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { @@ -315,7 +310,6 @@ VclPtr<SfxTabPage> SvxBitmapTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBitmapHdl_Impl, ListBox&, void) { std::unique_ptr<GraphicObject> pGraphicObject; @@ -432,7 +426,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBitmapHdl_Impl, ListBox&, void) } - long SvxBitmapTabPage::CheckChanges_Impl() { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -478,7 +471,6 @@ long SvxBitmapTabPage::CheckChanges_Impl() } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) { @@ -586,8 +578,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) /******************************************************************************/ - - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -669,7 +659,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -732,7 +721,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -765,7 +753,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -867,7 +854,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -934,7 +920,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickSaveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangePixelColorHdl_Impl, ListBox&, void) { m_pCtlPixel->SetPixelColor( m_pLbColor->GetSelectEntryColor() ); @@ -951,7 +936,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangePixelColorHdl_Impl, ListBox&, void } - IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl, ListBox&, void) { m_pCtlPixel->SetBackgroundColor( m_pLbBackgroundColor->GetSelectEntryColor() ); @@ -968,7 +952,6 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl, ListBox&, v } - void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) { if( pWindow == m_pCtlPixel ) @@ -985,8 +968,6 @@ void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) } - - vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const { if (pLabeled == m_pLbBitmaps) diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 9c7ee227cd0f..f376503c57b3 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -118,7 +118,6 @@ void SvxColorTabPage::UpdateTableName() } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -198,7 +197,6 @@ void SvxColorTabPage::EnableSave( bool bCanSave ) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( @@ -305,7 +303,6 @@ struct SvxColorTabPageShadow }; - SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs) , meType( XCOLOR_LIST ) @@ -445,7 +442,6 @@ void SvxColorTabPage::ImpColorCountChanged() } - void SvxColorTabPage::Construct() { if (pColorList.is()) @@ -521,7 +517,6 @@ SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) } - long SvxColorTabPage::CheckChanges_Impl() { // used to NOT lose changes @@ -586,7 +581,6 @@ long SvxColorTabPage::CheckChanges_Impl() } - bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet ) { if( ( nDlgType != 0 ) || @@ -648,7 +642,6 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) } - VclPtr<SfxTabPage> SvxColorTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { @@ -682,7 +675,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ModifiedHdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) ); @@ -767,7 +759,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -835,7 +826,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) { std::unique_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() )); @@ -874,7 +864,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -909,7 +898,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectColorLBHdl_Impl, ListBox&, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -932,7 +920,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectColorLBHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, void) { sal_Int32 nPos = m_pValSetColorList->GetSelectItemId(); @@ -955,7 +942,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, void) } - void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) { switch (eModell) @@ -1008,7 +994,6 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, SelectColorModelHdl_Impl, ListBox&, void) } - void SvxColorTabPage::ChangeColor(const Color &rNewColor) { aCurrentColor = rNewColor; @@ -1037,7 +1022,6 @@ void SvxColorTabPage::ChangeColor(const Color &rNewColor) } - //void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs ) //{ // long nCount = pColorList->Count(); @@ -1054,7 +1038,6 @@ void SvxColorTabPage::ChangeColor(const Color &rNewColor) //} - // A RGB value is converted to a CMYK value - not in an ideal way as // R is converted into C, G into M and B into Y. The K value is held in an // extra variable. For further color models one should develop own @@ -1074,7 +1057,6 @@ void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ) } - // reverse case to RgbToCmyk_Impl (see above) void SvxColorTabPage::CmykToRgb_Impl( Color& rColor, const sal_uInt16 nK ) @@ -1101,7 +1083,6 @@ void SvxColorTabPage::CmykToRgb_Impl( Color& rColor, const sal_uInt16 nK ) } - sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) { sal_uInt16 nWert = 0; @@ -1121,7 +1102,6 @@ sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor ) } - sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) { sal_uInt16 nWert = 0; @@ -1141,7 +1121,6 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) } - void SvxColorTabPage::FillUserData() { // the color model is saved in the Ini-file @@ -1149,7 +1128,6 @@ void SvxColorTabPage::FillUserData() } - void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame ) { const OfaRefItem<XColorList> *pPtr = nullptr; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index c074fca231b0..21cd0b3604f6 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -177,7 +177,6 @@ void SvxGradientTabPage::Construct() } - void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) { sal_Int32 nPos; @@ -254,7 +253,6 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( CheckChanges_Impl() == -1L ) @@ -267,7 +265,6 @@ SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet ) } - long SvxGradientTabPage::CheckChanges_Impl() { // is used here in order to NOT lose changes @@ -333,7 +330,6 @@ long SvxGradientTabPage::CheckChanges_Impl() } - bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_nDlgType == 0 && *m_pPageType == PT_GRADIENT && !*m_pbAreaTP ) @@ -370,7 +366,6 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) } - void SvxGradientTabPage::Reset( const SfxItemSet* ) { // m_pLbGradients->SelectEntryPos( 0 ); @@ -392,7 +387,6 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { @@ -400,7 +394,6 @@ VclPtr<SfxTabPage> SvxGradientTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_TYPED( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); @@ -435,7 +428,6 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void* pControl ) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) ); @@ -537,7 +529,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); @@ -604,7 +595,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); @@ -636,7 +626,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -741,7 +730,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( @@ -809,7 +797,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl_Impl, ListBox&, void) { std::unique_ptr<XGradient> pGradient; @@ -882,7 +869,6 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ChangeGradientHdl_Impl, ListBox&, void } - void SvxGradientTabPage::SetControlState_Impl( css::awt::GradientStyle eXGS ) { switch( eXGS ) diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index d6d4f850342b..a12478f80789 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -166,7 +166,6 @@ void SvxHatchTabPage::Construct() } - void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_Int32 nPos; @@ -236,7 +235,6 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) @@ -249,7 +247,6 @@ SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) } - long SvxHatchTabPage::CheckChanges_Impl() { if( m_pMtrDistance->IsValueChangedFromSaved() || @@ -298,7 +295,6 @@ long SvxHatchTabPage::CheckChanges_Impl() } - bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_nDlgType == 0 && !*m_pbAreaTP ) // area dialog @@ -332,7 +328,6 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) } - void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) { ChangeHatchHdl_Impl( *m_pLbHatchings ); @@ -358,7 +353,6 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) } - VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { @@ -366,7 +360,6 @@ VclPtr<SfxTabPage> SvxHatchTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_TYPED( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) { ModifiedHdl_Impl(&rListBox); @@ -405,7 +398,6 @@ void SvxHatchTabPage::ModifiedHdl_Impl( void* p ) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl_Impl, ListBox&, void) { std::unique_ptr<XHatch> pHatch; @@ -476,7 +468,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ChangeHatchHdl_Impl, ListBox&, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) ); @@ -572,7 +563,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); @@ -639,7 +629,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); @@ -671,7 +660,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -766,7 +754,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -833,7 +820,6 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickSaveHdl_Impl, Button*, void) } - void SvxHatchTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { if( pWindow == m_pCtlAngle ) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 65992f56815a..642133702bfc 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -554,7 +554,6 @@ void SvxLineTabPage::FillListboxes() } - void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) { const CntUInt16Item* pPageTypeItem = rSet.GetItem<CntUInt16Item>(SID_PAGE_TYPE, false); @@ -684,7 +683,6 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( m_nDlgType == 0 ) // Line dialog @@ -704,7 +702,6 @@ SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) { const SfxPoolItem* pOld = nullptr; @@ -1112,7 +1109,6 @@ bool SvxLineTabPage::FillXLSet_Impl() } - void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) { drawing::LineStyle eXLS; // drawing::LineStyle_NONE, drawing::LineStyle_SOLID, drawing::LineStyle_DASH @@ -1514,7 +1510,6 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) } - VclPtr<SfxTabPage> SvxLineTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { @@ -1590,7 +1585,6 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void * pCntrl ) } - IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void ) { ChangeStartHdl_Impl(p); @@ -1619,7 +1613,6 @@ void SvxLineTabPage::ChangeStartHdl_Impl( void * p ) } - IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeEdgeStyleHdl_Impl, ListBox&, void) { ChangePreviewHdl_Impl( nullptr ); @@ -1667,7 +1660,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) } - IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void ) { ChangeEndHdl_Impl(p); @@ -1696,7 +1688,6 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void * p ) } - IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) { sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); @@ -1710,14 +1701,12 @@ IMPL_LINK_NOARG_TYPED(SvxLineTabPage, ChangeTransparentHdl_Impl, Edit&, void) } - void SvxLineTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { m_eRP = eRcPt; } - void SvxLineTabPage::FillUserData() { // Write the synched value to the INI file diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 3ec2f9247eea..46198f999830 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -184,7 +184,6 @@ void SvxLineDefTabPage::Construct() } - void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) { if( nDlgType == 0 ) // area dialog @@ -216,7 +215,6 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); @@ -228,7 +226,6 @@ SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxLineDefTabPage::CheckChanges_Impl() { // is here used to NOT lose changes @@ -274,7 +271,6 @@ void SvxLineDefTabPage::CheckChanges_Impl() } - sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -283,7 +279,6 @@ void SvxLineDefTabPage::CheckChanges_Impl() } - bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) { if( nDlgType == 0 ) // line dialog @@ -301,7 +296,6 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) } - void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) { if( rAttrs->GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SfxItemState::DONTCARE ) @@ -347,14 +341,12 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) } - VclPtr<SfxTabPage> SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return VclPtr<SvxLineDefTabPage>::Create( pWindow, *rOutAttrs ); } - IMPL_LINK_TYPED( SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectLinestyleHdl_Impl(&rListBox); @@ -392,7 +384,6 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox* p) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangePreviewHdl_Impl, Edit&, void) { FillDash_Impl(); @@ -416,7 +407,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber1Hdl_Impl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) { if( m_pNumFldNumber2->GetValue() == 0L ) @@ -434,8 +424,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, Edit&, void) } - - IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) { if( !m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != eFUnit ) @@ -503,7 +491,6 @@ IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) } - IMPL_LINK_TYPED( SvxLineDefTabPage, SelectTypeListBoxHdl_Impl, ListBox&, rListBox, void ) { SelectTypeHdl_Impl(&rListBox); @@ -542,7 +529,6 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); @@ -631,7 +617,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -700,7 +685,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -736,7 +720,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -817,7 +800,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -871,7 +853,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) } - void SvxLineDefTabPage::FillDash_Impl() { css::drawing::DashStyle eXDS; @@ -895,7 +876,6 @@ void SvxLineDefTabPage::FillDash_Impl() } - void SvxLineDefTabPage::FillDialog_Impl() { css::drawing::DashStyle eXDS = aDash.GetDashStyle(); // css::drawing::DashStyle_RECT, css::drawing::DashStyle_ROUND diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 254fa299c28f..c9c7e56f087f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -129,7 +129,6 @@ void SvxLineEndDefTabPage::Resize() } - void SvxLineEndDefTabPage::Construct() { m_pLbLineEnds->Fill( pLineEndList ); @@ -157,7 +156,6 @@ void SvxLineEndDefTabPage::Construct() } - void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) { if( nDlgType == 0 ) // area dialog @@ -181,7 +179,6 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) } - SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) { CheckChanges_Impl(); @@ -193,7 +190,6 @@ SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxLineEndDefTabPage::CheckChanges_Impl() { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -218,7 +214,6 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() } - bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) { if( nDlgType == 0 ) // line dialog @@ -238,7 +233,6 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) } - void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) { m_pLbLineEnds->SelectEntryPos( 0 ); @@ -277,14 +271,12 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return VclPtr<SvxLineEndDefTabPage>::Create( pWindow, *rSet ); } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) { if( pLineEndList->Count() > 0 ) @@ -318,7 +310,6 @@ long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -398,7 +389,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) { if( pPolyObj ) @@ -512,7 +502,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -547,7 +536,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -629,7 +617,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 37a64510b280..1d9eddf343fd 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -195,7 +195,6 @@ void SvxShadowTabPage::Construct() } - void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) { sal_Int32 nPos; @@ -256,7 +255,6 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) @@ -266,7 +264,6 @@ SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) } - bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) { bool bModified = false; @@ -380,7 +377,6 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) } - void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) { if( !m_bDisable ) @@ -483,7 +479,6 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) } - VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { @@ -491,7 +486,6 @@ VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, } - IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE ) @@ -508,7 +502,6 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, SelectShadowHdl_Impl, ListBox&, void) { ModifyShadowHdl_Impl(*m_pMtrTransparent); @@ -553,7 +546,6 @@ IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ModifyShadowHdl_Impl, Edit&, void) } - void SvxShadowTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { m_eRP = eRcPt; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index feca458c8c24..cc7c3bfe3606 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -117,7 +117,6 @@ SvxTransformTabDialog::SvxTransformTabDialog( vcl::Window* pParent, const SfxIte } - void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) { if (nId==nPosSize) @@ -164,7 +163,6 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } - void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidation&,void>& rLink) { aValidateLink = rLink; @@ -285,7 +283,6 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet) } - void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) { const double fUIScale(double(pView->GetModel()->GetUIScale())); @@ -325,20 +322,17 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) } - VclPtr<SfxTabPage> SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { return VclPtr<SvxAngleTabPage>::Create(pWindow, *rSet); } - void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/) { } - SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) @@ -350,7 +344,6 @@ SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RECT_POINT eRP) { if(pWindow == m_pCtlRect) @@ -487,7 +480,6 @@ void SvxSlantTabPage::Construct() } - bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) { bool bModified = false; @@ -711,7 +703,6 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) @@ -723,7 +714,6 @@ SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) } - void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT ) { } @@ -917,7 +907,6 @@ void SvxPositionSizeTabPage::Construct() } - bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { bool bModified(false); @@ -1041,7 +1030,6 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) } - void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) { const SfxPoolItem* pItem; @@ -1148,14 +1136,12 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) } - VclPtr<SfxTabPage> SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return VclPtr<SvxPositionSizeTabPage>::Create( pWindow, *rOutAttrs ); } - void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) { SfxRectangleItem const * pRectItem = nullptr; @@ -1172,7 +1158,6 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet ) } - SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) @@ -1193,7 +1178,6 @@ SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void) { // #106572# Remember user's last choice @@ -1202,7 +1186,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void } - void SvxPositionSizeTabPage::UpdateControlStates() { const bool bPosProtect = m_pTsbPosProtect->GetState() == TRISTATE_TRUE; @@ -1236,7 +1219,6 @@ void SvxPositionSizeTabPage::UpdateControlStates() } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void) { if( m_pTsbSizeProtect->IsEnabled() ) @@ -1256,7 +1238,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, voi } - void SvxPositionSizeTabPage::SetMinMaxPosition() { // position @@ -1427,7 +1408,6 @@ void SvxPositionSizeTabPage::SetMinMaxPosition() } - void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange) { switch (m_pCtlPos->GetActualRP()) @@ -1484,7 +1464,6 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const } - void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) { if( pWindow == m_pCtlPos ) @@ -1556,21 +1535,18 @@ void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP } - void SvxPositionSizeTabPage::DisableResize() { mbSizeDisabled = true; } - void SvxPositionSizeTabPage::DisableProtect() { mbProtectDisabled = true; } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) @@ -1593,7 +1569,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeWidthHdl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) { if( m_pCbxScale->IsChecked() && m_pCbxScale->IsEnabled() ) @@ -1616,14 +1591,12 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeHeightHdl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void) { UpdateControlStates(); } - IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) { if( m_pCbxScale->IsChecked() ) @@ -1634,7 +1607,6 @@ IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) } - void SvxPositionSizeTabPage::FillUserData() { // matching is saved in the Ini-file diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 4e406d163de2..fcada5615bb6 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -451,7 +451,6 @@ namespace dbaccess }; - // ORowSetClone class ORowSetClone : public comphelper::OBaseMutex diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 1ba973ce8b6c..c4b0c5f7ceb9 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -692,7 +692,6 @@ bool ORowSetCache::next( ) } - bool ORowSetCache::isFirst( ) { return m_nPosition == 1; // ask resultset for diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 6a6a7f8ab605..c328f3a07f96 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -62,7 +62,6 @@ using namespace ::osl; using namespace ::utl; - OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection) : OSubComponent(m_aMutex,_xConnection) { diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index a7490bd7cd01..f59e3d37f560 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -53,7 +53,6 @@ OBookmarkContainer::OBookmarkContainer(OWeakObject& _rParent, Mutex& _rMutex) } - void SAL_CALL OBookmarkContainer::acquire( ) throw() { m_rParent.acquire(); diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index ef3713e143dd..c7d27fa1ec98 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -74,7 +74,6 @@ void SAL_CALL OInterceptor::dispose() } - OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder ) :m_pContentHolder( _pContentHolder ) ,m_aInterceptedURL(7) @@ -349,7 +348,6 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons } - //XDispatchProviderInterceptor Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException, std::exception ) diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 8d1d38783a38..9d7f688b637c 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -34,7 +34,6 @@ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> - namespace dbaccess { typedef ::cppu::ImplHelper5< css::sdb::XSQLQueryComposer, diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 8f90a1ad3124..6f5601ab4f9d 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -315,7 +315,6 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const } - DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const { OUString sDsn(comphelper::string::stripEnd(_rDsn, '*')); diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index e30fbd493870..5ce581ba1e3a 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -18,7 +18,6 @@ */ - #if defined(WNT) #if defined _MSC_VER #pragma warning(push, 1) diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index a89fbf432150..fea1c67a7b43 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -68,5 +68,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index a3898ec52112..ae498b119c6f 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -47,5 +47,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDESIGNVIEW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 5a3ce03125b0..f921e7e6cd90 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -74,7 +74,6 @@ namespace dbaui virtual void dragFinished( ) override; - public: OTableWindowListBox(OTableWindow* pParent); virtual ~OTableWindowListBox(); @@ -98,5 +97,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index e8190d660e1d..b79d9c7e38e1 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -86,9 +86,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DBEXCHANGE_HXX - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 5ae14cdf8aa5..07d44c8393f0 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -83,5 +83,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 9b804323e7f8..92136919ad99 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -86,5 +86,4 @@ namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 69c6fb40fad9..9763f639f2b3 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -597,7 +597,6 @@ bool OFieldDescription::IsAutoIncrement() const } - bool OFieldDescription::IsNullable() const { if ( m_xDest.is() && m_xDestInfo->hasPropertyByName(PROPERTY_ISNULLABLE) ) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 958ca8ac1121..a46e50b54b8b 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -328,7 +328,6 @@ void DoRestartActionsIfNecessary(bool quickstart) { } - ResMgr* Desktop::GetDesktopResManager() { if ( !Desktop::pResMgr ) @@ -1874,7 +1873,6 @@ IMPL_STATIC_LINK_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void) } - class ExitTimer : public Timer { public: diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index f8b09575dcbc..4f5b284d184e 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -66,7 +66,6 @@ namespace desktop { - static void configureUcb() { // For backwards compatibility, in case some code still uses plain diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 67a6a144c576..38cd63620289 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -783,10 +783,4 @@ void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) th } - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index efada59ba142..26b86711d39e 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -322,7 +322,6 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign } - // The OfficeIPCThreadController implementation is a bookkeeper for all pending requests // that were created by the OfficeIPCThread. The requests are waiting to be processed by // our framework loadComponentFromURL function (e.g. open/print request). diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 38004c537f38..3b0d79186fc2 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -78,7 +78,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::system; - namespace dp_gui { #define TOP_OFFSET 5 @@ -237,7 +236,6 @@ void ExtBoxWithBtns_Impl::RecalcAll() } - //This function may be called with nPos < 0 void ExtBoxWithBtns_Impl::selectEntry( const long nPos ) { @@ -963,7 +961,6 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void) } - IMPL_LINK_TYPED( ExtMgrDialog, startProgress, void*, _bLockInterface, void ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 63bb21b7c018..7e62952655bd 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -111,7 +111,6 @@ OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage ) namespace dp_gui { - class ProgressCmdEnv : public ::cppu::WeakImplHelper< ucb::XCommandEnvironment, task::XInteractionHandler, @@ -324,7 +323,6 @@ ProgressCmdEnv::~ProgressCmdEnv() } - // XCommandEnvironment uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler() diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 99bbeaed6b04..f5f820c05de6 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; namespace dp_gui { - ::rtl::Reference< TheExtensionManager > TheExtensionManager::s_ExtMgr; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index dd4fac0ff9c9..329459e56502 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -192,8 +192,6 @@ struct UpdateDialog::Index }; - - class UpdateDialog::Thread: public salhelper::Thread { public: Thread( @@ -696,8 +694,6 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos ) } - - sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind ) { m_pUpdates->InsertEntry( pEntry->m_aName, TREELIST_APPEND, static_cast< void * >( pEntry ), kind ); @@ -1141,7 +1137,6 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, } - IMPL_LINK_NOARG_TYPED(UpdateDialog, selectionHandler, SvTreeListBox*, void) { OUStringBuffer b; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 9455da23fead..9989d79eb0b2 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -201,7 +201,6 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - LicenseDialogImpl::LicenseDialogImpl( vcl::Window * pParent, cssu::Reference< cssu::XComponentContext > const & xContext, @@ -294,10 +293,6 @@ IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, EndReachedHdl, LicenseView&, void) } - - - - LicenseDialog::LicenseDialog( Sequence<Any> const& args, Reference<XComponentContext> const& xComponentContext) : m_xComponentContext(xComponentContext) diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index a062ea69efe6..1f7aa09079dd 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -208,7 +208,6 @@ void LicenseCommandEnv::handle( } - NoLicenseCommandEnv::NoLicenseCommandEnv( css::uno::Reference< css::task::XInteractionHandler> const & handler): BaseCommandEnv(handler) diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 58aadbb0900d..6f3398786584 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -161,7 +161,6 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard() namespace dp_manager { - //ToDo: bundled extension ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& xContext) : ::cppu::WeakComponentImplHelper< css::deployment::XExtensionManager >(getMutex()), @@ -176,7 +175,6 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x } - ExtensionManager::~ExtensionManager() { } diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 7bbc04857215..49e284290087 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -85,7 +85,6 @@ private: }; - PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) : mxContext( xContext ), mxUpdateInformation( deployment::UpdateInformationProvider::create( xContext ) ) @@ -93,7 +92,6 @@ PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XCo } - PackageInformationProvider::~PackageInformationProvider() { } @@ -134,7 +132,6 @@ OUString PackageInformationProvider::getPackageLocation( } - OUString SAL_CALL PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) throw ( uno::RuntimeException, std::exception ) @@ -324,8 +321,6 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider:: } - - namespace sdecl = comphelper::service_decl; sdecl::class_<PackageInformationProvider> servicePIP; extern sdecl::ServiceDecl const serviceDecl( diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 0c87238bc669..4ee47bf22100 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -1122,8 +1122,6 @@ PackageManagerImpl::getDeployedPackages( } - - //ToDo: the function must not call registerPackage, do this in //XExtensionManager.reinstallDeployedExtensions void PackageManagerImpl::reinstallDeployedPackages( @@ -1560,7 +1558,6 @@ sal_Int32 PackageManagerImpl::checkPrerequisites( } - PackageManagerImpl::CmdEnvWrapperImpl::~CmdEnvWrapperImpl() { } diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index b8f059fa7043..c1850cf31595 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_PROPERTIES_HXX - #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <boost/optional.hpp> @@ -30,7 +29,6 @@ namespace dp_manager { - /** */ @@ -65,8 +63,6 @@ public: } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 4749537cab15..949d76211b4f 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -239,7 +239,6 @@ bool needToSyncRepository(OUString const & name) } // anon namespace - namespace { inline OUString encodeForRcFile( OUString const & str ) { @@ -306,8 +305,6 @@ OUString makeURLAppendSysPathSegment( OUString const & baseURL, OUString const & } - - OUString expandUnoRcTerm( OUString const & term_ ) { OUString term(term_); diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index fd183ace4af2..891e1537cd48 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -332,7 +332,6 @@ extension(ext) } - UpdateInfoMap getOnlineUpdateInfos( Reference<uno::XComponentContext> const &xContext, Reference<deployment::XExtensionManager> const & xExtMgr, diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index 93895d41ff5a..197ce6a49b0a 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -204,11 +204,4 @@ namespace desktop { } - - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index 2fa6172e428f..71b859866001 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -94,7 +94,6 @@ public: }; - } } } diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index b309f1882912..ae7192ca20ae 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -337,7 +337,6 @@ public: }; - BackendImpl::ComponentPackageImpl::ComponentPackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, OUString const & url, OUString const & name, @@ -390,7 +389,6 @@ BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const } - void BackendImpl::ComponentPackageImpl::disposing() { Package::disposing(); @@ -747,7 +745,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } - void BackendImpl::unorc_verify_init( Reference<XCommandEnvironment> const & xCmdEnv ) { diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 3df952adba7a..a9f31922f34b 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -279,7 +279,6 @@ bool BackendImpl::activateEntry(OUString const & url) } - // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > @@ -357,7 +356,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } - void BackendImpl::configmgrini_verify_init( Reference<XCommandEnvironment> const & xCmdEnv ) { diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index e38b3885dc15..88dd77640d9d 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -74,7 +74,6 @@ public: }; - } } } diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 17abf4a40db2..4e3e2aeeb987 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -302,7 +302,6 @@ void PackageRegistryBackend::deleteUnusedFolders( } - Package::~Package() { } @@ -456,7 +455,6 @@ sal_Bool Package::checkDependencies( } - Sequence< Reference<deployment::XPackage> > Package::getBundle( Reference<task::XAbortChannel> const &, Reference<XCommandEnvironment> const & ) diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 62e6737beaed..4c072281cda4 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -170,7 +170,6 @@ OUString normalizeMediaType( OUString const & mediaType ) } - void PackageRegistryImpl::packageRemoved( OUString const & url, OUString const & mediaType) throw (css::deployment::DeploymentException, diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 68a876547faa..b0719d61196b 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -191,7 +191,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } - // Package BackendImpl * BackendImpl::ExecutablePackageImpl::getMyBackend() const { @@ -309,7 +308,6 @@ bool BackendImpl::ExecutablePackageImpl::getFileAttributes(sal_uInt64& out_Attri } - } // anon namespace namespace sdecl = comphelper::service_decl; diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index da5ff6cf7099..050b758dd025 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -58,7 +58,6 @@ public: }; - } } } diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 191e1a54d293..2dd822a0c197 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -73,7 +73,6 @@ public: }; - } } } diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 899cee3e137c..51fc2ea6bd73 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -158,7 +158,6 @@ class BackendImpl : public ImplBaseT virtual void SAL_CALL disposing() override; - public: PackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, @@ -472,7 +471,6 @@ void BackendImpl::revokeEntryFromDb(OUString const & url) } - BackendImpl::PackageImpl::PackageImpl( ::rtl::Reference<PackageRegistryBackend> const & myBackend, OUString const & url, diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx index 7adc9a2a8668..8c288d9b5755 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx @@ -66,7 +66,6 @@ OUString ScriptBackendDb::getKeyElementName() } - } // namespace executable } // namespace backend } // namespace dp_registry diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index c1a6024f4d86..aee78da3642b 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -56,7 +56,6 @@ public: }; - } } } diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index 238153cb3630..4b283fc61838 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx @@ -21,7 +21,6 @@ #include "dp_parceldesc.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index df0fe2239ed0..1e578a370098 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -179,7 +179,6 @@ BackendImpl::BackendImpl( } - // XPackageRegistry Sequence< Reference<deployment::XPackageTypeInfo> > diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 457b479fb0a5..5a3ad0b8ec0e 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -27,12 +27,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - namespace migration { - #define sSourceUserBasic "/user/basic" #define sTargetUserBasic "/user/__basic_80" @@ -46,7 +44,6 @@ namespace migration } - Sequence< OUString > BasicMigration_getSupportedServiceNames() { Sequence< OUString > aNames { "com.sun.star.migration.Basic" }; @@ -62,13 +59,11 @@ namespace migration } - BasicMigration::~BasicMigration() { } - TStringVectorPtr BasicMigration::getFiles( const OUString& rBaseURL ) const { TStringVectorPtr aResult( new TStringVector ); @@ -123,7 +118,6 @@ namespace migration } - void BasicMigration::copyFiles() { OUString sTargetDir; @@ -167,7 +161,6 @@ namespace migration } - sal_Bool BasicMigration::supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) { @@ -175,7 +168,6 @@ namespace migration } - Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException, std::exception) { return BasicMigration_getSupportedServiceNames(); @@ -232,8 +224,6 @@ namespace migration } - - } // namespace migration diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index 7b2657cde030..ecdf3a931433 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -33,7 +33,6 @@ class INetURLObject; - namespace migration { @@ -44,7 +43,6 @@ namespace migration css::uno::Reference< css::uno::XComponentContext > const & xContext ); - // class BasicMigration diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index ac9b39bd1467..d18c8e1825a1 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -77,7 +77,6 @@ CJavaInfo::~CJavaInfo() } - class JavaMigration : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, @@ -190,8 +189,6 @@ public: css::lang::WrappedTargetException, std::exception ) override; - - virtual ~JavaMigration(); private: diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index f2c162052c29..a6ca64fb303b 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -59,7 +59,6 @@ OUString OO3ExtensionMigration_getImplementationName() } - Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames() { return Sequence< OUString > { "com.sun.star.migration.Extensions" }; @@ -75,7 +74,6 @@ m_ctx(ctx) } - OO3ExtensionMigration::~OO3ExtensionMigration() { } @@ -296,7 +294,6 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir ) } - // XServiceInfo @@ -306,7 +303,6 @@ OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException, } - sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) { @@ -314,7 +310,6 @@ sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName) } - Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException, std::exception) { return OO3ExtensionMigration_getSupportedServiceNames(); @@ -463,7 +458,6 @@ Reference< XInterface > SAL_CALL OO3ExtensionMigration_create( } - } // namespace migration /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 7568201e74fa..ddd648b1d849 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -52,7 +52,6 @@ namespace migration css::uno::Reference< css::uno::XComponentContext > const & xContext ); - // class ExtensionMigration diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index b289ee5f549a..3546cfaae949 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -27,17 +27,14 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - namespace migration { - static const char sSourceSubDir[] = "/user/wordbook"; static const char sTargetSubDir[] = "/user/wordbook"; - // component operations @@ -47,7 +44,6 @@ namespace migration } - Sequence< OUString > WordbookMigration_getSupportedServiceNames() { return Sequence< OUString > { "com.sun.star.migration.Wordbooks" }; @@ -62,13 +58,11 @@ namespace migration } - WordbookMigration::~WordbookMigration() { } - TStringVectorPtr WordbookMigration::getFiles( const OUString& rBaseURL ) const { TStringVectorPtr aResult( new TStringVector ); @@ -161,8 +155,6 @@ bool IsUserWordbook( const OUString& rFile ) } - - void WordbookMigration::copyFiles() { OUString sTargetDir; @@ -209,7 +201,6 @@ bool IsUserWordbook( const OUString& rFile ) } - sal_Bool WordbookMigration::supportsService(OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) { @@ -217,7 +208,6 @@ bool IsUserWordbook( const OUString& rFile ) } - Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException, std::exception) { return WordbookMigration_getSupportedServiceNames(); @@ -274,8 +264,6 @@ bool IsUserWordbook( const OUString& rFile ) } - - } // namespace migration diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 8982c76b2e19..fc6757e2856b 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -33,7 +33,6 @@ class INetURLObject; - namespace migration { @@ -44,7 +43,6 @@ namespace migration css::uno::Reference< css::uno::XComponentContext > const & xContext ); - // class WordbookMigration diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 417791ca66c5..86ae42221ed8 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -94,7 +94,6 @@ public: }; - CommandEnvironmentImpl::CommandEnvironmentImpl( Reference<XComponentContext> const & xComponentContext, OUString const & log_file, diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 81e9e720a599..3b73159cb1c4 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -346,7 +346,6 @@ void printf_packages( } - namespace { diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx index 4c3d94883e6d..76ee748de1a4 100644 --- a/desktop/win32/source/guiloader/genericloader.cxx +++ b/desktop/win32/source/guiloader/genericloader.cxx @@ -41,7 +41,6 @@ #include "../loader.hxx" - static int GenericMain() { TCHAR szTargetFileName[MAX_PATH]; @@ -143,7 +142,6 @@ static int GenericMain() } - #ifdef __MINGW32__ int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR, int ) #else @@ -154,7 +152,6 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) } - #ifdef __MINGW32__ int __cdecl main() #else diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 81be53204c67..a5531ea368e2 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -117,8 +117,6 @@ BOOL WINAPI ConvertSidToStringSid( PSID pSid, LPTSTR* StringSid ) } - - static LPTSTR *GetCommandArgs( int *pArgc ) { #ifdef UNICODE @@ -130,7 +128,6 @@ static LPTSTR *GetCommandArgs( int *pArgc ) } - namespace { bool writeArgument(HANDLE pipe, char prefix, WCHAR const * argument) { diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx b/drawinglayer/source/attribute/fillgradientattribute.cxx index 497817e9b3d4..c91e40c48ea3 100644 --- a/drawinglayer/source/attribute/fillgradientattribute.cxx +++ b/drawinglayer/source/attribute/fillgradientattribute.cxx @@ -22,7 +22,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx b/drawinglayer/source/attribute/fillhatchattribute.cxx index f54db0861655..e3dd831bf35a 100644 --- a/drawinglayer/source/attribute/fillhatchattribute.cxx +++ b/drawinglayer/source/attribute/fillhatchattribute.cxx @@ -22,7 +22,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx index 571b29160d4c..20d743d314ec 100644 --- a/drawinglayer/source/attribute/fontattribute.cxx +++ b/drawinglayer/source/attribute/fontattribute.cxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx index 1548dbf2c073..5e720fbd6969 100644 --- a/drawinglayer/source/attribute/lineattribute.cxx +++ b/drawinglayer/source/attribute/lineattribute.cxx @@ -22,7 +22,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx index f3a0822a575f..ce59c1d60cb8 100644 --- a/drawinglayer/source/attribute/linestartendattribute.cxx +++ b/drawinglayer/source/attribute/linestartendattribute.cxx @@ -23,7 +23,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx index 0d914facea4d..59d39a07265e 100644 --- a/drawinglayer/source/attribute/materialattribute3d.cxx +++ b/drawinglayer/source/attribute/materialattribute3d.cxx @@ -22,7 +22,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx index f8ebeb2cb655..5b3004eb36db 100644 --- a/drawinglayer/source/attribute/sdrallattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx @@ -20,7 +20,6 @@ #include <drawinglayer/attribute/sdrallattribute3d.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx index 2ad96fec408f..422f3eb3d262 100644 --- a/drawinglayer/source/attribute/sdrfillattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillattribute.cxx @@ -25,7 +25,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx index 214c15048734..e23149b316eb 100644 --- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx @@ -23,7 +23,6 @@ #include <vcl/graphic.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx index e2786fcccfc8..e249a88c2677 100644 --- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx @@ -23,7 +23,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx index 43b4b946d3da..d50094300f3b 100644 --- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx @@ -24,7 +24,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx index e3d49cb1ae00..aac95d7a4644 100644 --- a/drawinglayer/source/attribute/sdrlineattribute.cxx +++ b/drawinglayer/source/attribute/sdrlineattribute.cxx @@ -22,7 +22,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx index b64f98c59042..b70aa185f3b2 100644 --- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx +++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx @@ -22,7 +22,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx index 512895a2c048..d513c39eb4aa 100644 --- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx @@ -22,7 +22,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx index be683da700b0..1580a51bbec4 100644 --- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx @@ -21,7 +21,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx b/drawinglayer/source/attribute/sdrshadowattribute.cxx index 907423aa2238..4a938fde8175 100644 --- a/drawinglayer/source/attribute/sdrshadowattribute.cxx +++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx @@ -23,7 +23,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx index efbcc5dbcc42..932be14cc9c8 100644 --- a/drawinglayer/source/attribute/strokeattribute.cxx +++ b/drawinglayer/source/attribute/strokeattribute.cxx @@ -22,7 +22,6 @@ #include <numeric> - namespace drawinglayer { namespace attribute diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index 70cae59dffdd..c201a0377f64 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star; - namespace drawinglayer { namespace unorenderer @@ -98,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace unorenderer diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index c161c097273a..ca7daf60e041 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -26,11 +26,9 @@ #include <rtl/instance.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace geometry @@ -393,7 +391,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace geometry diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index 303a06c05d78..9a4a5b60ce04 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -26,11 +26,9 @@ #include <rtl/instance.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace geometry @@ -420,7 +418,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace geometry diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index d8c088315c74..64427fbe6d86 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -24,11 +24,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -90,7 +88,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -125,7 +122,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index ea10d205e2d8..2bbdb5ffd64c 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -26,11 +26,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 5dc8fc6c3614..3d1e31e8a7e1 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -28,11 +28,9 @@ #include <basegfx/tools/canvastools.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -76,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index c0bf971e7afc..30d3cde3db63 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx @@ -22,11 +22,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx index b2a7ea4f535d..a1dc4e0e1e3b 100644 --- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx @@ -27,11 +27,9 @@ #include <drawinglayer/primitive2d/maskprimitive2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx index e406a3b506b1..37e79c5123a9 100644 --- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx @@ -22,7 +22,6 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx index b845602c4fb9..3649a021f95d 100644 --- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx @@ -25,7 +25,6 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -158,7 +157,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index d3538f45b9ed..8f9f6793df95 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -29,11 +29,9 @@ #include <drawinglayer/processor3d/shadow3dextractor.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index 7f506eea8f2d..f2ba0606a09f 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -26,11 +26,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx index 0bb39f53494e..9056d8d0ab44 100644 --- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx @@ -30,11 +30,9 @@ #include <drawinglayer/primitive2d/graphicprimitivehelper2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 886c1b26327f..026fd9200484 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -28,11 +28,9 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index b83ed34dccce..b601ab01dc01 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -26,11 +26,9 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx index eae9502cf5c4..2add1dacf8e1 100644 --- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index 3962f65c0f8b..216dee5c6ed5 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -26,11 +26,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx index 0723b2952abf..7f2152b8a990 100644 --- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx index e5cb6e80254e..52c52580cf25 100644 --- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx index 1d0bbae6545c..26d87e4b8ae7 100644 --- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx @@ -27,11 +27,9 @@ #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx index 530ff008675a..c57416a365a4 100644 --- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index 1140228ed582..143e5984388f 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 4a641d60891c..4df709aa5973 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -56,11 +56,9 @@ #include <numeric> - using namespace com::sun::star; - namespace { /** helper class for graphic context @@ -199,7 +197,6 @@ namespace } // end of anonymous namespace - namespace { /** stack for properites @@ -359,7 +356,6 @@ namespace } // end of anonymous namespace - namespace { /** helper to convert a vcl::Region to a B2DPolyPolygon @@ -385,7 +381,6 @@ namespace } // end of anonymous namespace - namespace { /** Helper class to buffer and hold a Primitive target vector. It @@ -465,7 +460,6 @@ namespace } // end of anonymous namespace - namespace { /** Helper class which builds a stack on the TargetHolder class */ @@ -519,7 +513,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace primitive2d @@ -567,7 +560,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace { /** helper to convert a MapMode to a transformation */ @@ -3171,7 +3163,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx index 4e370379594c..8ab7ef827473 100644 --- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index c4fd3f03d105..89ed88323e7c 100644 --- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx @@ -26,11 +26,9 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx index 19140d977308..f68fc9eb2630 100644 --- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx @@ -27,11 +27,9 @@ #include <drawinglayer/primitive2d/maskprimitive2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx index edbe3c360073..e32942661042 100644 --- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index dfc4aa4a8f52..5cb7640affca 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -87,7 +87,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -403,7 +402,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -516,7 +514,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx index dbdd2c558b81..79456604bb5c 100644 --- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx @@ -33,11 +33,9 @@ #include <vcl/graphic.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -97,7 +95,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -170,7 +167,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -255,7 +251,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -295,7 +290,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -367,7 +361,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -445,7 +438,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -573,7 +565,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx index 228b63a2d7bd..72f1a783217c 100644 --- a/drawinglayer/source/primitive2d/primitivetools2d.cxx +++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx @@ -22,7 +22,6 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -54,7 +53,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -85,7 +83,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -116,7 +113,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index f3042c034f85..effe4e59beb1 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -34,11 +34,9 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx index 11025b456822..3c97a65ec7fc 100644 --- a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx +++ b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index abdce86fcbcb..2c2396f5417b 100644 --- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx @@ -27,11 +27,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx index d26ac9b95e6d..63a4d74841c7 100644 --- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index 4bc3994f5ec5..35644b01bcc6 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -31,11 +31,9 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> - using namespace com::sun::star; - namespace { sal_uInt32 calculateStepsForSvgGradient(const basegfx::BColor& rColorA, const basegfx::BColor& rColorB, double fDelta, double fDiscreteUnit) @@ -60,7 +58,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace primitive2d @@ -319,7 +316,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -605,7 +601,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index b3dfbeee09d5..01859123f141 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/i18n/CharType.hpp> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index 93e9ba1f0450..2851773e473c 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -30,7 +30,6 @@ #include <drawinglayer/primitive2d/textbreakuphelper.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx index f55d1dbaacba..5e9e7bd41dd6 100644 --- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx index f8cf72259ab0..669263ec78b7 100644 --- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx @@ -20,7 +20,6 @@ #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index f69d4766d014..1b3ac6753cc8 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -42,7 +40,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -59,7 +56,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -76,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -93,7 +88,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -127,7 +121,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index e5d58548766b..df33d4698145 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -26,7 +26,6 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 43aaa2bc0758..a1901c9f655b 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -26,11 +26,9 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - using namespace com::sun::star; - namespace { // adapts fontScale for usage with TextLayouter. Input is rScale which is the extracted @@ -83,7 +81,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index b65c54cbc6bc..d37020cb9278 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -28,7 +28,6 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -61,7 +60,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -146,7 +144,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx index b70c0b6a4d67..e6ee6b8b67de 100644 --- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx @@ -22,11 +22,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx index 193674d9ad8e..0e85958d2ea5 100644 --- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx index 111ecda61cd4..20db26f69671 100644 --- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx @@ -27,11 +27,9 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index 58b73d1a1572..c5c3ea691a9c 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx @@ -28,7 +28,6 @@ #include <vcl/graphic.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx index e488422a653e..69321f7b7375 100644 --- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx @@ -24,7 +24,6 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx index a0fc5d2b6e72..fd584f2e19c6 100644 --- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx @@ -22,11 +22,9 @@ #include <basegfx/tools/canvastools.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d @@ -70,7 +68,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx index 029ddf73fdeb..443d695339fd 100644 --- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index c191db51b19f..338b28320866 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -31,11 +31,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx index cfa4e8fd0af2..80019729bc95 100644 --- a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx index c74dba780178..dc089c89f4d4 100644 --- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index 1367d0a3fe5a..ed9cb4b5ed51 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx @@ -25,11 +25,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d @@ -68,7 +66,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index bbef152697d9..720b056e14f5 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -29,7 +29,6 @@ #include <rtl/instance.hxx> - namespace drawinglayer { namespace primitive3d @@ -526,11 +525,9 @@ namespace drawinglayer } // end of namespace drawinglayer - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx index 7dc3b00dd846..3a77955da71a 100644 --- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx @@ -23,11 +23,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 86a8b2454df6..7ef81ef382a7 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -29,11 +29,9 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index da802ddd7b86..1d152a254a52 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx @@ -41,7 +41,6 @@ #include <drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index bea38f3ec761..de221fb77b4a 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -346,7 +346,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index 46b865451fc8..f6c2d49854ad 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -30,11 +30,9 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index 2f2d62118c71..ddc523cdc6b9 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -30,11 +30,9 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx index 285de36f55a9..67120c5a50d9 100644 --- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx @@ -26,11 +26,9 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx index 06cfe8ba5710..0778f8782014 100644 --- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx @@ -23,11 +23,9 @@ #include <drawinglayer/attribute/sdrlineattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index e9d39e48f922..8f04c40434f1 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -29,11 +29,9 @@ #include <drawinglayer/attribute/sdrshadowattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx index 782170daf46d..9d0e937e5c43 100644 --- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx @@ -21,11 +21,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx index 674e76846c57..d8acf84ebb00 100644 --- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx @@ -22,11 +22,9 @@ #include <basegfx/color/bcolor.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d @@ -58,7 +56,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -119,7 +116,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -154,7 +150,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -188,7 +183,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx index 8f155418730e..7ca469242c21 100644 --- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx @@ -22,11 +22,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive3d diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx index d5d4ea492bcc..31e3019c2ad3 100644 --- a/drawinglayer/source/processor2d/baseprocessor2d.cxx +++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx @@ -20,11 +20,9 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace processor2d diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx index 62896bb13331..a2d7915451dd 100644 --- a/drawinglayer/source/processor2d/contourextractor2d.cxx +++ b/drawinglayer/source/processor2d/contourextractor2d.cxx @@ -30,11 +30,9 @@ #include <drawinglayer/primitive2d/sceneprimitive2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace processor2d diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx index 13a015fbff33..e154ad438773 100644 --- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx +++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx @@ -24,11 +24,9 @@ #include <basegfx/color/bcolormodifier.hxx> - using namespace com::sun::star; - namespace drawinglayer { bool renderWrongSpellPrimitive2D( diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx index 57eb83175e0e..f8f2bc6cde64 100644 --- a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx +++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx @@ -51,7 +51,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_HELPERWRONGSPELLRENDERER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx index baa987ddb69c..e1951eb6a2dc 100644 --- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx +++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx @@ -24,11 +24,9 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace processor2d diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx index 4c96d9e6fa14..49863873ddba 100644 --- a/drawinglayer/source/processor2d/processor2dtools.cxx +++ b/drawinglayer/source/processor2d/processor2dtools.cxx @@ -21,11 +21,9 @@ #include "vclmetafileprocessor2d.hxx" - using namespace com::sun::star; - namespace drawinglayer { namespace processor2d @@ -62,5 +60,4 @@ namespace drawinglayer } // end of namespace drawinglayer - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx index 1805d23a05c0..933b938a0cb4 100644 --- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx +++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> - namespace drawinglayer { namespace processor2d diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx index 0ba73114dc4f..b56cf58bb852 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx @@ -56,7 +56,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_VCLHELPERBUFFERDEVICE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index af92c617e1ea..2b646b461083 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -745,14 +745,11 @@ namespace drawinglayer as intended, the original file is exported. Works, Done. - - To be done: - Maybe there are more places to take care of for vcl::PDFExtOutDevData! - ****************************************************************************************************/ void VclMetafileProcessor2D::processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx index 0f7c71ff38e8..bbd604e41fba 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx @@ -52,7 +52,6 @@ namespace basegfx { } - namespace drawinglayer { namespace processor2d @@ -145,7 +144,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 8398573ddb4e..16bb6b4d8e97 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -57,7 +57,6 @@ #include <com/sun/star/table/BorderLineStyle.hpp> - using namespace com::sun::star; namespace { diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx index 5b095a7c4c3b..3d8d61e070a2 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace primitive2d { }} - namespace drawinglayer { namespace processor2d @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx b/drawinglayer/source/processor2d/vclprocessor2d.hxx index c4b012008337..019043b0bc38 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx @@ -56,7 +56,6 @@ namespace drawinglayer { namespace primitive2d { }} - namespace drawinglayer { namespace processor2d @@ -127,7 +126,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_VCLPROCESSOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx index c6d92b1b000e..b418ed1b0924 100644 --- a/drawinglayer/source/processor3d/baseprocessor3d.cxx +++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx @@ -20,11 +20,9 @@ #include <drawinglayer/processor3d/baseprocessor3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace processor3d diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx index 0daeb529cd76..d056632381d6 100644 --- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx +++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx @@ -28,7 +28,6 @@ #include <drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx> - namespace drawinglayer { namespace processor3d diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index cf874bcbb8ba..bd865096ad9d 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -38,11 +38,9 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace processor3d diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx index 82216ac65917..517eb02df150 100644 --- a/drawinglayer/source/processor3d/geometry2dextractor.cxx +++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx @@ -30,11 +30,9 @@ #include <drawinglayer/primitive3d/textureprimitive3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace processor3d diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx index 7598fe44bc53..1d3b744a9325 100644 --- a/drawinglayer/source/processor3d/shadow3dextractor.cxx +++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx @@ -31,11 +31,9 @@ #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace processor3d diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index 9df695c2f6fa..e205d89c53da 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -60,7 +60,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -97,7 +96,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -193,7 +191,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -278,7 +275,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -335,7 +331,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -412,7 +407,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -471,7 +465,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -548,7 +541,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -696,7 +688,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index 0f74d37d06d6..fbeecaef3417 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -22,7 +22,6 @@ #include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx> - namespace drawinglayer { namespace texture @@ -57,7 +56,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -239,7 +237,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -316,7 +313,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx index c903a5f5f31e..90c54056f76b 100644 --- a/drawinglayer/source/tools/converters.cxx +++ b/drawinglayer/source/tools/converters.cxx @@ -31,7 +31,6 @@ #endif - namespace drawinglayer { namespace tools diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx index 61cb5833b741..5feb3d0a1286 100644 --- a/editeng/source/accessibility/AccessibleComponentBase.cxx +++ b/editeng/source/accessibility/AccessibleComponentBase.cxx @@ -41,8 +41,6 @@ AccessibleComponentBase::AccessibleComponentBase() } - - AccessibleComponentBase::~AccessibleComponentBase() { } @@ -61,8 +59,6 @@ sal_Bool SAL_CALL AccessibleComponentBase::containsPoint ( } - - uno::Reference<XAccessible > SAL_CALL AccessibleComponentBase::getAccessibleAtPoint ( const awt::Point& /*aPoint*/) @@ -72,8 +68,6 @@ uno::Reference<XAccessible > SAL_CALL } - - awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds() throw (uno::RuntimeException, std::exception) { @@ -81,8 +75,6 @@ awt::Rectangle SAL_CALL AccessibleComponentBase::getBounds() } - - awt::Point SAL_CALL AccessibleComponentBase::getLocation() throw (css::uno::RuntimeException, std::exception) { @@ -91,8 +83,6 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocation() } - - awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) { @@ -100,8 +90,6 @@ awt::Point SAL_CALL AccessibleComponentBase::getLocationOnScreen() } - - css::awt::Size SAL_CALL AccessibleComponentBase::getSize() throw (css::uno::RuntimeException, std::exception) { @@ -110,8 +98,6 @@ css::awt::Size SAL_CALL AccessibleComponentBase::getSize() } - - void SAL_CALL AccessibleComponentBase::addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& /*xListener*/) @@ -121,8 +107,6 @@ void SAL_CALL AccessibleComponentBase::addFocusListener ( } - - void SAL_CALL AccessibleComponentBase::removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& /*xListener*/ ) throw (css::uno::RuntimeException) @@ -131,8 +115,6 @@ void SAL_CALL AccessibleComponentBase::removeFocusListener (const css::uno::Refe } - - void SAL_CALL AccessibleComponentBase::grabFocus() throw (css::uno::RuntimeException, std::exception) { @@ -148,8 +130,6 @@ void SAL_CALL AccessibleComponentBase::grabFocus() } - - sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() throw (css::uno::RuntimeException, std::exception) { @@ -157,8 +137,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getForeground() } - - sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() throw (css::uno::RuntimeException, std::exception) { @@ -166,8 +144,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground() } - - // XAccessibleExtendedComponent css::uno::Reference< css::awt::XFont > SAL_CALL @@ -178,8 +154,6 @@ css::uno::Reference< css::awt::XFont > SAL_CALL } - - OUString SAL_CALL AccessibleComponentBase::getTitledBorderText() throw (css::uno::RuntimeException, std::exception) { diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 3e5481f82d4b..019b1d136a47 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -107,8 +107,6 @@ bool AccessibleContextBase::SetState (sal_Int16 aState) } - - bool AccessibleContextBase::ResetState (sal_Int16 aState) { ::osl::ClearableMutexGuard aGuard (maMutex); @@ -133,8 +131,6 @@ bool AccessibleContextBase::ResetState (sal_Int16 aState) } - - bool AccessibleContextBase::GetState (sal_Int16 aState) { ::osl::MutexGuard aGuard (maMutex); @@ -148,8 +144,6 @@ bool AccessibleContextBase::GetState (sal_Int16 aState) } - - void AccessibleContextBase::SetRelationSet ( const uno::Reference<XAccessibleRelationSet>& rxNewRelationSet) throw (css::uno::RuntimeException) @@ -176,8 +170,6 @@ void AccessibleContextBase::SetRelationSet ( } - - // XAccessible uno::Reference< XAccessibleContext> SAL_CALL @@ -189,8 +181,6 @@ uno::Reference< XAccessibleContext> SAL_CALL } - - // XAccessibleContext /** No children. @@ -204,8 +194,6 @@ sal_Int32 SAL_CALL } - - /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ @@ -220,8 +208,6 @@ uno::Reference<XAccessible> SAL_CALL } - - uno::Reference<XAccessible> SAL_CALL AccessibleContextBase::getAccessibleParent() throw (css::uno::RuntimeException, std::exception) @@ -231,8 +217,6 @@ uno::Reference<XAccessible> SAL_CALL } - - sal_Int32 SAL_CALL AccessibleContextBase::getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) @@ -267,8 +251,6 @@ sal_Int32 SAL_CALL } - - sal_Int16 SAL_CALL AccessibleContextBase::getAccessibleRole() throw (css::uno::RuntimeException, std::exception) @@ -278,8 +260,6 @@ sal_Int16 SAL_CALL } - - OUString SAL_CALL AccessibleContextBase::getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) @@ -290,8 +270,6 @@ OUString SAL_CALL } - - OUString SAL_CALL AccessibleContextBase::getAccessibleName() throw (css::uno::RuntimeException, std::exception) @@ -310,8 +288,6 @@ OUString SAL_CALL } - - /** Return a copy of the relation set. */ uno::Reference<XAccessibleRelationSet> SAL_CALL @@ -333,8 +309,6 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL } - - /** Return a copy of the state set. Possible states are: ENABLED @@ -379,8 +353,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL } - - lang::Locale SAL_CALL AccessibleContextBase::getLocale() throw (IllegalAccessibleComponentStateException, @@ -402,8 +374,6 @@ lang::Locale SAL_CALL } - - // XAccessibleEventListener void SAL_CALL AccessibleContextBase::addAccessibleEventListener ( @@ -427,8 +397,6 @@ void SAL_CALL AccessibleContextBase::addAccessibleEventListener ( } - - void SAL_CALL AccessibleContextBase::removeAccessibleEventListener ( const uno::Reference<XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) @@ -476,8 +444,6 @@ uno::Sequence< OUString > SAL_CALL } - - // XTypeProvider uno::Sequence< css::uno::Type> @@ -515,8 +481,6 @@ void SAL_CALL AccessibleContextBase::disposing() } - - void AccessibleContextBase::SetAccessibleDescription ( const OUString& rDescription, StringOrigin eDescriptionOrigin) @@ -540,8 +504,6 @@ void AccessibleContextBase::SetAccessibleDescription ( } - - void AccessibleContextBase::SetAccessibleName ( const OUString& rName, StringOrigin eNameOrigin) @@ -565,8 +527,6 @@ void AccessibleContextBase::SetAccessibleName ( } - - OUString AccessibleContextBase::CreateAccessibleDescription() throw (css::uno::RuntimeException, std::exception) { @@ -574,8 +534,6 @@ OUString AccessibleContextBase::CreateAccessibleDescription() } - - OUString AccessibleContextBase::CreateAccessibleName() throw (css::uno::RuntimeException, std::exception) { @@ -583,8 +541,6 @@ OUString AccessibleContextBase::CreateAccessibleName() } - - void AccessibleContextBase::CommitChange ( sal_Int16 nEventId, const uno::Any& rNewValue, @@ -606,8 +562,6 @@ void AccessibleContextBase::CommitChange ( } - - void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent) { if (mnClientId) @@ -615,8 +569,6 @@ void AccessibleContextBase::FireEvent (const AccessibleEventObject& aEvent) } - - void AccessibleContextBase::ThrowIfDisposed() throw (css::lang::DisposedException) { @@ -629,14 +581,12 @@ void AccessibleContextBase::ThrowIfDisposed() } - bool AccessibleContextBase::IsDisposed() { return (rBHelper.bDisposed || rBHelper.bInDispose); } - void AccessibleContextBase::SetAccessibleRole( sal_Int16 _nRole ) { maRole = _nRole; diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index e4a5ab8cb22e..1d25a45085de 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <vector> #include <algorithm> @@ -56,11 +53,9 @@ #include <svl/intitem.hxx> - // Project-local header - #include <com/sun/star/beans/PropertyState.hpp> #include <editeng/unolingu.hxx> @@ -80,11 +75,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; - // AccessibleEditableTextPara implementation - namespace accessibility { const SvxItemPropertySet* ImplGetSvxCharAndParaPropertiesSet() @@ -2841,5 +2834,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx index 3e73c05e4b04..0dddfcee9e10 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.cxx +++ b/editeng/source/accessibility/AccessibleHyperlink.cxx @@ -30,12 +30,9 @@ using namespace ::com::sun::star; - - // AccessibleHyperlink implementation - namespace accessibility { @@ -131,5 +128,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index f02a1dab8194..30fbdb56dd1b 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -18,8 +18,6 @@ */ - - // Global header @@ -30,11 +28,9 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> - // Project-local header - #include <editeng/unoedhlp.hxx> #include <editeng/unopracc.hxx> #include <editeng/unoedsrc.hxx> @@ -46,7 +42,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; - namespace accessibility { AccessibleParaManager::AccessibleParaManager() : @@ -330,7 +325,6 @@ namespace accessibility nEndPara >= nStartPara, "AccessibleParaManager::FireEvent: invalid index" ); - if( 0 <= nStartPara && 0 <= nEndPara && maChildren.size() > static_cast<size_t>(nStartPara) && maChildren.size() >= static_cast<size_t>(nEndPara) && @@ -392,5 +386,4 @@ namespace accessibility } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx index a5d2ed8b040c..900447fa8df5 100644 --- a/editeng/source/accessibility/AccessibleSelectionBase.cxx +++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx @@ -34,13 +34,11 @@ namespace accessibility } - AccessibleSelectionBase::~AccessibleSelectionBase() { } - void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -48,7 +46,6 @@ namespace accessibility } - sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -56,7 +53,6 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -64,7 +60,6 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -72,7 +67,6 @@ namespace accessibility } - sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -80,7 +74,6 @@ namespace accessibility } - uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); @@ -88,7 +81,6 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( implGetMutex() ); diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 08da4ee432be..1dde47258869 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <utility> #include <vector> @@ -40,11 +37,9 @@ #include <com/sun/star/accessibility/AccessibleTextType.hpp> - // Project-local header - #include <editeng/editdata.hxx> #include <editeng/unopracc.hxx> #include "editeng/unoedprx.hxx" @@ -97,12 +92,9 @@ namespace accessibility } - // AccessibleStaticTextBase_Impl declaration - - /** AccessibleStaticTextBase_Impl This class implements the AccessibleStaticTextBase @@ -186,11 +178,9 @@ namespace accessibility }; - // AccessibleStaticTextBase_Impl implementation - AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() : mxThis( nullptr ), mpTextParagraph( new AccessibleEditableTextPara(nullptr) ), @@ -999,5 +989,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx index ecddbd32a75f..d3e6f49dfef7 100644 --- a/editeng/source/accessibility/AccessibleStringWrap.cxx +++ b/editeng/source/accessibility/AccessibleStringWrap.cxx @@ -26,11 +26,9 @@ #include <editeng/AccessibleStringWrap.hxx> - // AccessibleStringWrap implementation - AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ) : mrDev( rDev ), mrFont( rFont ), diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 088327fd3a49..223ffdd1ccc5 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -49,7 +49,6 @@ #include "editattr.hxx" - // class EditCharAttrib EditCharAttrib::EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE ) : @@ -70,7 +69,6 @@ void EditCharAttrib::SetFont( SvxFont&, OutputDevice* ) } - // class EditCharAttribFont EditCharAttribFont::EditCharAttribFont( const SvxFontItem& rAttr, sal_uInt16 _nStart, sal_uInt16 _nEnd ) diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index 4f0c87f44749..6db6fd6c0960 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -322,7 +322,6 @@ public: }; - // class EditCharAttribLanguage class EditCharAttribLanguage : public EditCharAttrib diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index b8d0ed1943cb..0868b4c29928 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -60,8 +60,6 @@ using std::endl; using namespace com::sun::star; - - XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd ) { // Create thw new attribute in the pool @@ -689,7 +687,6 @@ void EditTextObjectImpl::DestroyAttrib( XEditAttribute* pAttr ) } - ContentInfo* EditTextObjectImpl::CreateAndInsertContent() { aContents.push_back(std::unique_ptr<ContentInfo>(new ContentInfo(*pPool))); diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 6f7241013c99..13a772f9145c 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -544,7 +544,6 @@ bool WrongList::DbgIsBuggy() const } - EdtAutoCorrDoc::EdtAutoCorrDoc( EditEngine* pE, ContentNode* pN, sal_Int32 nCrsr, sal_Unicode cIns) : mpEditEngine(pE), diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 3b01c185df61..dd3e58f7a13b 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -1143,7 +1143,6 @@ inline short ImpEditEngine::GetXValue( short nXValue ) const } - inline long ImpEditEngine::GetXValue( long nXValue ) const { if ( !aStatus.DoStretch() || ( nStretchX == 100 ) ) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 1f9bc7430b25..4c94f4f392c2 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1592,7 +1592,6 @@ static bool lcl_HasStrongLTR ( const OUString& rTxt, sal_Int32 nStart, sal_Int3 } - void ImpEditEngine::InitScriptTypes( sal_Int32 nPara ) { ParaPortion* pParaPortion = GetParaPortions().SafeGetObject( nPara ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 38cb7752767b..f8bd382a98d3 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -269,7 +269,6 @@ static bool lcl_ConnectToPrev( sal_Unicode cCh, sal_Unicode cPrevCh ) // For Ka } - // class ImpEditEngine void ImpEditEngine::UpdateViews( EditView* pCurView ) @@ -710,7 +709,6 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) } - // Search for line with InvalidPos, start one line before // Flag the line => do not remove it ! diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f6d5aeed014d..9e9812e2b4ee 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -3107,7 +3107,6 @@ void ImpEditEngine::SetAddExtLeading( bool bExtLeading ) }; - bool ImpEditEngine::ImplHasText() const { return ( ( GetEditDoc().Count() > 1 ) || GetEditDoc().GetObject(0)->Len() ); diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 5491fbee2ca3..dd61f09a8235 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::linguistic2; - TextConvWrapper::TextConvWrapper( vcl::Window* pWindow, const Reference< XComponentContext >& rxContext, const lang::Locale& rSourceLocale, @@ -565,5 +564,4 @@ bool TextConvWrapper::HasRubySupport() const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index ab1e9f852891..0c9f0c52b9d7 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -401,14 +401,12 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle nStyle ) } - SvxBorderLine::SvxBorderLine( const SvxBorderLine& r ) { *this = r; } - SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r ) { aColor = r.aColor; @@ -426,7 +424,6 @@ SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r ) } - void SvxBorderLine::ScaleMetrics( long nMult, long nDiv ) { m_nMult = nMult; @@ -536,7 +533,6 @@ sal_uInt16 SvxBorderLine::GetDistance() const } - bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const { return ( ( aColor == rCmp.aColor ) && diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 2791bf44293c..acbcf2701738 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -29,10 +29,6 @@ #define BULITEM_VERSION ((sal_uInt16)2) - - - - void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont ) { sal_uInt16 nTemp; @@ -59,7 +55,6 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const vcl::Font& rFont ) } - vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) { vcl::Font aFont; @@ -98,8 +93,6 @@ vcl::Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) } - - SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) { SetDefaultFont_Impl(); @@ -177,28 +170,24 @@ SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem ) } - SvxBulletItem::~SvxBulletItem() { delete pGraphicObject; } - SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxBulletItem( *this ); } - SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { return new SvxBulletItem( rStrm, Which() ); } - void SvxBulletItem::SetDefaultFont_Impl() { aFont = OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE ); @@ -207,7 +196,6 @@ void SvxBulletItem::SetDefaultFont_Impl() } - void SvxBulletItem::SetDefaults_Impl() { pGraphicObject = nullptr; @@ -219,14 +207,12 @@ void SvxBulletItem::SetDefaults_Impl() } - sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const { return BULITEM_VERSION; } - void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) { vcl::Font _aFont = GetFont(); @@ -246,8 +232,6 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom ) } - - bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT(dynamic_cast< const SvxBulletItem* >(&rItem) != nullptr,"operator==Types not matching"); @@ -283,7 +267,6 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const } - SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { // Correction for empty bitmap @@ -345,7 +328,6 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c } - OUString SvxBulletItem::GetFullText() const { OUStringBuffer aStr(aPrevText); @@ -355,7 +337,6 @@ OUString SvxBulletItem::GetFullText() const } - bool SvxBulletItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -369,7 +350,6 @@ bool SvxBulletItem::GetPresentation } - const GraphicObject& SvxBulletItem::GetGraphicObject() const { if( pGraphicObject ) @@ -382,7 +362,6 @@ const GraphicObject& SvxBulletItem::GetGraphicObject() const } - void SvxBulletItem::SetGraphicObject( const GraphicObject& rGraphicObject ) { if( ( GRAPHIC_NONE == rGraphicObject.GetType() ) || ( GRAPHIC_DEFAULT == rGraphicObject.GetType() ) ) diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 6432cbbf41fb..a49f7c4489a7 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -224,26 +224,22 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase ); - SvxFieldData::SvxFieldData() { } - SvxFieldData::~SvxFieldData() { } - SvxFieldData* SvxFieldData::Clone() const { return new SvxFieldData; } - bool SvxFieldData::operator==( const SvxFieldData& rFld ) const { DBG_ASSERT( typeid(*this) == typeid(rFld), "==: Different Types" ); @@ -252,13 +248,11 @@ bool SvxFieldData::operator==( const SvxFieldData& rFld ) const } - void SvxFieldData::Load( SvPersistStream & /*rStm*/ ) { } - void SvxFieldData::Save( SvPersistStream & /*rStm*/ ) { } @@ -275,7 +269,6 @@ MetaAction* SvxFieldData::createEndComment() } - SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) : SfxPoolItem( nId ) { @@ -283,7 +276,6 @@ SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) : } - SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : SfxPoolItem( nId ) { @@ -291,7 +283,6 @@ SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) : } - SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : SfxPoolItem ( rItem ) { @@ -299,21 +290,18 @@ SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) : } - SvxFieldItem::~SvxFieldItem() { delete pField; } - SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const { return new SvxFieldItem(*this); } - SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const { SvxFieldData* pData = nullptr; @@ -330,7 +318,6 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const } - SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { DBG_ASSERT( pField, "SvxFieldItem::Store: Field?!" ); @@ -351,7 +338,6 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co } - bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); @@ -372,7 +358,6 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const SV_IMPL_PERSIST1( SvxDateField, SvxFieldData ); - SvxDateField::SvxDateField() { nFixDate = Date( Date::SYSTEM ).GetDate(); @@ -381,7 +366,6 @@ SvxDateField::SvxDateField() } - SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF ) { nFixDate = rDate.GetDate(); @@ -390,14 +374,12 @@ SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF } - SvxFieldData* SvxDateField::Clone() const { return new SvxDateField( *this ); } - bool SvxDateField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -410,7 +392,6 @@ bool SvxDateField::operator==( const SvxFieldData& rOther ) const } - void SvxDateField::Load( SvPersistStream & rStm ) { sal_uInt16 nType, nFormat; @@ -424,7 +405,6 @@ void SvxDateField::Load( SvPersistStream & rStm ) } - void SvxDateField::Save( SvPersistStream & rStm ) { rStm.WriteUInt32( nFixDate ); @@ -433,7 +413,6 @@ void SvxDateField::Save( SvPersistStream & rStm ) } - OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { Date aDate( Date::EMPTY ); @@ -513,14 +492,12 @@ MetaAction* SvxDateField::createBeginComment() const SV_IMPL_PERSIST1( SvxURLField, SvxFieldData ); - SvxURLField::SvxURLField() { eFormat = SVXURLFORMAT_URL; } - SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt ) : aURL( rURL ), aRepresentation( rRepres ) { @@ -528,14 +505,12 @@ SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLF } - SvxFieldData* SvxURLField::Clone() const { return new SvxURLField( *this ); } - bool SvxURLField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -549,7 +524,6 @@ bool SvxURLField::operator==( const SvxFieldData& rOther ) const } - static void write_unicode( SvPersistStream & rStm, const OUString& rString ) { sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength()); @@ -593,7 +567,6 @@ void SvxURLField::Load( SvPersistStream & rStm ) } - void SvxURLField::Save( SvPersistStream & rStm ) { rStm.WriteUInt16( eFormat ); @@ -788,7 +761,6 @@ void SvxTableField::Save( SvPersistStream & /*rStm*/ ) SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData ); - SvxExtTimeField::SvxExtTimeField() : m_nFixTime( tools::Time(tools::Time::SYSTEM).GetTime() ) { @@ -797,7 +769,6 @@ SvxExtTimeField::SvxExtTimeField() } - SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxTimeFormat eF ) : m_nFixTime( rTime.GetTime() ) { @@ -806,14 +777,12 @@ SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxT } - SvxFieldData* SvxExtTimeField::Clone() const { return new SvxExtTimeField( *this ); } - bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -826,7 +795,6 @@ bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const } - void SvxExtTimeField::Load( SvPersistStream & rStm ) { sal_uInt16 nType, nFormat; @@ -840,7 +808,6 @@ void SvxExtTimeField::Load( SvPersistStream & rStm ) } - void SvxExtTimeField::Save( SvPersistStream & rStm ) { rStm.WriteInt64(m_nFixTime); @@ -849,7 +816,6 @@ void SvxExtTimeField::Save( SvPersistStream & rStm ) } - OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const { tools::Time aTime( tools::Time::EMPTY ); @@ -933,7 +899,6 @@ MetaAction* SvxExtTimeField::createBeginComment() const SV_IMPL_PERSIST1( SvxExtFileField, SvxFieldData ); - SvxExtFileField::SvxExtFileField() { eType = SVXFILETYPE_VAR; @@ -941,7 +906,6 @@ SvxExtFileField::SvxExtFileField() } - SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileFormat eF ) { aFile = rStr; @@ -950,14 +914,12 @@ SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileF } - SvxFieldData* SvxExtFileField::Clone() const { return new SvxExtFileField( *this ); } - bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -970,7 +932,6 @@ bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const } - void SvxExtFileField::Load( SvPersistStream & rStm ) { sal_uInt16 nType, nFormat; @@ -986,7 +947,6 @@ void SvxExtFileField::Load( SvPersistStream & rStm ) } - void SvxExtFileField::Save( SvPersistStream & rStm ) { // UNICODE: rStm << aFile; @@ -997,7 +957,6 @@ void SvxExtFileField::Save( SvPersistStream & rStm ) } - OUString SvxExtFileField::GetFormatted() const { OUString aString; @@ -1080,7 +1039,6 @@ OUString SvxExtFileField::GetFormatted() const SV_IMPL_PERSIST1( SvxAuthorField, SvxFieldData ); - SvxAuthorField::SvxAuthorField() { eType = SVXAUTHORTYPE_VAR; @@ -1088,7 +1046,6 @@ SvxAuthorField::SvxAuthorField() } - SvxAuthorField::SvxAuthorField( const OUString& rFirstName, const OUString& rLastName, const OUString& rShortName, @@ -1102,14 +1059,12 @@ SvxAuthorField::SvxAuthorField( const OUString& rFirstName, } - SvxFieldData* SvxAuthorField::Clone() const { return new SvxAuthorField( *this ); } - bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const { if ( typeid(rOther) != typeid(*this) ) @@ -1124,7 +1079,6 @@ bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const } - void SvxAuthorField::Load( SvPersistStream & rStm ) { sal_uInt16 nType = 0, nFormat = 0; @@ -1141,7 +1095,6 @@ void SvxAuthorField::Load( SvPersistStream & rStm ) } - void SvxAuthorField::Save( SvPersistStream & rStm ) { write_unicode( rStm, aName ); @@ -1153,7 +1106,6 @@ void SvxAuthorField::Save( SvPersistStream & rStm ) } - OUString SvxAuthorField::GetFormatted() const { OUString aString; @@ -1201,7 +1153,6 @@ SvClassManager& SvxFieldItem::GetClassManager() } - SV_IMPL_PERSIST1( SvxHeaderField, SvxFieldData ); SvxHeaderField::SvxHeaderField() {} @@ -1225,7 +1176,6 @@ void SvxHeaderField::Save( SvPersistStream & /*rStm*/ ) } - SV_IMPL_PERSIST1( SvxFooterField, SvxFieldData ); SvxFooterField::SvxFooterField() {} @@ -1248,7 +1198,6 @@ void SvxFooterField::Save( SvPersistStream & /*rStm*/ ) } - SV_IMPL_PERSIST1( SvxDateTimeField, SvxFieldData ); SvxFieldData* SvxDateTimeField::Clone() const diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 5bb17666b627..e3caabbb2b49 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -1411,7 +1411,6 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1423,14 +1422,12 @@ bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxShadowItem::Clone( SfxItemPool* ) const { return new SvxShadowItem( *this ); } - sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const { sal_uInt16 nSpace = 0; @@ -1468,7 +1465,6 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const } - bool SvxShadowItem::GetPresentation ( SfxItemPresentation ePres, @@ -1518,7 +1514,6 @@ bool SvxShadowItem::GetPresentation } - SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetLocation() ) @@ -1539,14 +1534,12 @@ bool SvxShadowItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxShadowItem::HasMetrics() const { return true; } - SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 cLoc; @@ -1564,14 +1557,12 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const } - sal_uInt16 SvxShadowItem::GetValueCount() const { return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 } - OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" ); @@ -1579,14 +1570,12 @@ OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxShadowItem::GetEnumValue() const { return (sal_uInt16)GetLocation(); } - void SvxShadowItem::SetEnumValue( sal_uInt16 nVal ) { SetLocation( (const SvxShadowLocation)nVal ); @@ -1621,7 +1610,6 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) : } - SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), @@ -1638,7 +1626,6 @@ SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) : } - SvxBoxItem::~SvxBoxItem() { delete pTop; @@ -1648,7 +1635,6 @@ SvxBoxItem::~SvxBoxItem() } - SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) { nTopDist = rBox.nTopDist; @@ -1663,7 +1649,6 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) } - inline bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 ) { if( pBrd1 == pBrd2 ) @@ -1674,7 +1659,6 @@ inline bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 ) } - bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -1837,7 +1821,6 @@ SvxBoxItem::LineToSvxLine(const css::table::BorderLine2& rLine, SvxBorderLine& r } - namespace { @@ -2076,14 +2059,12 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const { return new SvxBoxItem( *this ); } - bool SvxBoxItem::GetPresentation ( SfxItemPresentation ePres, @@ -2222,7 +2203,6 @@ bool SvxBoxItem::GetPresentation } - SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { rStrm.WriteUInt16( GetDistance() ); @@ -2264,7 +2244,6 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const } - sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const { DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || @@ -2291,14 +2270,12 @@ bool SvxBoxItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxBoxItem::HasMetrics() const { return true; } - SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const { sal_uInt16 nDistance; @@ -2338,7 +2315,6 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const } - const SvxBorderLine *SvxBoxItem::GetLine( SvxBoxItemLine nLine ) const { const SvxBorderLine *pRet = nullptr; @@ -2366,7 +2342,6 @@ const SvxBorderLine *SvxBoxItem::GetLine( SvxBoxItemLine nLine ) const } - void SvxBoxItem::SetLine( const SvxBorderLine* pNew, SvxBoxItemLine nLine ) { SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : nullptr; @@ -2396,7 +2371,6 @@ void SvxBoxItem::SetLine( const SvxBorderLine* pNew, SvxBoxItemLine nLine ) } - sal_uInt16 SvxBoxItem::GetDistance() const { // The smallest distance that is not 0 will be returned. @@ -2412,7 +2386,6 @@ sal_uInt16 SvxBoxItem::GetDistance() const } - sal_uInt16 SvxBoxItem::GetDistance( SvxBoxItemLine nLine ) const { sal_uInt16 nDist = 0; @@ -2438,7 +2411,6 @@ sal_uInt16 SvxBoxItem::GetDistance( SvxBoxItemLine nLine ) const } - void SvxBoxItem::SetDistance( sal_uInt16 nNew, SvxBoxItemLine nLine ) { switch ( nLine ) @@ -2461,7 +2433,6 @@ void SvxBoxItem::SetDistance( sal_uInt16 nNew, SvxBoxItemLine nLine ) } - sal_uInt16 SvxBoxItem::CalcLineSpace( SvxBoxItemLine nLine, bool bIgnoreLine ) const { SvxBorderLine* pTmp = nullptr; @@ -2512,7 +2483,6 @@ SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) : } - SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) : SfxPoolItem( rCpy ), mbEnableHor( rCpy.mbEnableHor ), @@ -2527,7 +2497,6 @@ SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) : } - SvxBoxInfoItem::~SvxBoxInfoItem() { delete pHori; @@ -2535,7 +2504,6 @@ SvxBoxInfoItem::~SvxBoxInfoItem() } - SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) { delete pHori; @@ -2552,7 +2520,6 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy ) } - bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const { const SvxBoxInfoItem& rBoxInfo = static_cast<const SvxBoxInfoItem&>(rAttr); @@ -2571,7 +2538,6 @@ bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const } - void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, SvxBoxInfoItemLine nLine ) { SvxBorderLine* pTmp = pNew ? new SvxBorderLine( *pNew ) : nullptr; @@ -2594,14 +2560,12 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, SvxBoxInfoItemLine nLin } - SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const { return new SvxBoxInfoItem( *this ); } - bool SvxBoxInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2615,7 +2579,6 @@ bool SvxBoxInfoItem::GetPresentation } - SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { sal_Int8 cFlags = 0; @@ -2659,14 +2622,12 @@ bool SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxBoxInfoItem::HasMetrics() const { return true; } - SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 cFlags; @@ -2703,7 +2664,6 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const } - void SvxBoxInfoItem::ResetFlags() { nValidFlags = static_cast<SvxBoxInfoItemValidFlags>(0x7F); // all valid except Disable @@ -2771,7 +2731,6 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } - bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -2945,7 +2904,6 @@ bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const } - bool SvxFormatBreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2959,7 +2917,6 @@ bool SvxFormatBreakItem::GetPresentation } - OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" ); diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index c743afc58c46..dff82ee7ca44 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -26,7 +26,6 @@ #include <rtl/ustrbuf.hxx> - OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl ) { bool bNeg = false; @@ -129,14 +128,12 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co } - OUString GetSvxString( sal_uInt16 nId ) { return EE_RESSTR( nId ); } - OUString GetColorString( const Color& rCol ) { OUString sStr; @@ -171,7 +168,6 @@ OUString GetColorString( const Color& rCol ) } - sal_uInt16 GetMetricId( SfxMapUnit eUnit ) { sal_uInt16 nId = RID_SVXITEMS_METRIC_MM; diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 32d50c745723..0aa568f3984a 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -31,14 +31,12 @@ #include <com/sun/star/style/VerticalAlignment.hpp> - SfxPoolItem* SvxHorJustifyItem::CreateDefault() { return new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, 0) ;} SfxPoolItem* SvxVerJustifyItem::CreateDefault() { return new SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, 0) ;} using namespace ::com::sun::star; - SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) : SfxEnumItem( nId, (sal_uInt16)SVX_HOR_JUSTIFY_STANDARD ) { diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 54521c2cabc7..b10864a51f06 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -45,7 +45,6 @@ SfxSpellCheckItem::SfxSpellCheckItem } - SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : SfxPoolItem( rItem ), @@ -54,7 +53,6 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) : } - bool SfxSpellCheckItem::GetPresentation ( SfxItemPresentation , @@ -68,14 +66,12 @@ bool SfxSpellCheckItem::GetPresentation } - SfxPoolItem* SfxSpellCheckItem::Clone( SfxItemPool* ) const { return new SfxSpellCheckItem( *this ); } - bool SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==(rItem), "unequal types" ); @@ -92,7 +88,6 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) : } - SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : SfxPoolItem ( rItem ), @@ -103,7 +98,6 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) : } - bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -113,14 +107,12 @@ bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const { return new SfxHyphenRegionItem( *this ); } - bool SfxHyphenRegionItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -138,7 +130,6 @@ bool SfxHyphenRegionItem::GetPresentation } - SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const { sal_uInt8 _nMinLead, _nMinTrail; @@ -150,7 +141,6 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const } - SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const { rStrm.WriteUChar( GetMinLead() ) diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx index dd83f990647b..345bc6c8b61c 100644 --- a/editeng/source/items/paperinf.cxx +++ b/editeng/source/items/paperinf.cxx @@ -33,7 +33,6 @@ inline bool IsValidPrinter( const Printer* pPtr ) } - Size SvxPaperInfo::GetPaperSize( Paper ePaper, MapUnit eUnit ) { PaperInfo aInfo(ePaper); @@ -84,7 +83,6 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter ) } - Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy ) { Size aSize(eUnit == MAP_100TH_MM ? rSize : OutputDevice::LogicToLogic(rSize, eUnit, MAP_100TH_MM)); @@ -95,7 +93,6 @@ Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy } - long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit ) { nSize = eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, eUnit, MAP_100TH_MM); @@ -104,7 +101,6 @@ long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit ) } - Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit ) { PaperInfo aInfo(PaperInfo::getSystemDefaultPaper()); diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 061bf02c9eba..31e39bc4b1f0 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -79,7 +79,6 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId } - bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -212,14 +211,12 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const { return new SvxLineSpacingItem( *this ); } - bool SvxLineSpacingItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -237,7 +234,6 @@ bool SvxLineSpacingItem::GetPresentation } - SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 nPropSpace; @@ -260,7 +256,6 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetPropLineSpace() ) @@ -272,14 +267,12 @@ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion* } - sal_uInt16 SvxLineSpacingItem::GetValueCount() const { return SVX_LINESPACE_END; // SVX_LINESPACE_TWO_LINES + 1 } - OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const { //! load strings from resource @@ -303,7 +296,6 @@ OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxLineSpacingItem::GetEnumValue() const { sal_uInt16 nVal; @@ -318,7 +310,6 @@ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const } - void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal ) { switch ( nVal ) @@ -339,7 +330,6 @@ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId ) } - bool SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -405,14 +395,12 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const { return new SvxAdjustItem( *this ); } - bool SvxAdjustItem::GetPresentation ( SfxItemPresentation ePres, @@ -433,14 +421,12 @@ bool SvxAdjustItem::GetPresentation } - sal_uInt16 SvxAdjustItem::GetValueCount() const { return SVX_ADJUST_END; // SVX_ADJUST_BLOCKLINE + 1 } - OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" ); @@ -448,21 +434,18 @@ OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxAdjustItem::GetEnumValue() const { return (sal_uInt16)GetAdjust(); } - void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal ) { SetAdjust( (const SvxAdjust)nVal ); } - sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const { return (nFileVersion == SOFFICE_FILEFORMAT_31) @@ -470,7 +453,6 @@ sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const } - SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const { char eAdjustment; @@ -488,7 +470,6 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const } - SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const { rStrm.WriteChar( (char)GetAdjust() ); @@ -514,14 +495,12 @@ SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) : } - SfxPoolItem* SvxWidowsItem::Clone( SfxItemPool * ) const { return new SvxWidowsItem( *this ); } - SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 nLines; @@ -530,7 +509,6 @@ SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetValue() ); @@ -538,7 +516,6 @@ SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c } - bool SvxWidowsItem::GetPresentation ( SfxItemPresentation ePres, @@ -579,14 +556,12 @@ SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) : } - SfxPoolItem* SvxOrphansItem::Clone( SfxItemPool * ) const { return new SvxOrphansItem( *this ); } - SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 nLines; @@ -595,7 +570,6 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( GetValue() ); @@ -603,7 +577,6 @@ SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) } - bool SvxOrphansItem::GetPresentation ( SfxItemPresentation ePres, @@ -697,7 +670,6 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -711,14 +683,12 @@ bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const { return new SvxHyphenZoneItem( *this ); } - bool SvxHyphenZoneItem::GetPresentation ( SfxItemPresentation ePres, @@ -774,7 +744,6 @@ bool SvxHyphenZoneItem::GetPresentation } - SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const { sal_Int8 _bHyphen, _bHyphenPageEnd; @@ -790,7 +759,6 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const } - SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( (sal_Int8) IsHyphen() ) @@ -812,7 +780,6 @@ SvxTabStop::SvxTabStop() } - SvxTabStop::SvxTabStop( const sal_Int32 nPos, const SvxTabAdjust eAdjst, const sal_Unicode cDec, const sal_Unicode cFil ) { @@ -846,7 +813,6 @@ SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) : } - SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs, const sal_uInt16 nDist, const SvxTabAdjust eAdjst, @@ -862,7 +828,6 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs, } - SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) : SfxPoolItem( rTSI.Which() ), maTabStops( rTSI.maTabStops ) @@ -870,7 +835,6 @@ SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) : } - sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const { SvxTabStopArr::const_iterator it = maTabStops.find( rTab ); @@ -878,7 +842,6 @@ sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const } - sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const { SvxTabStopArr::const_iterator it = maTabStops.find( SvxTabStop( nPos ) ); @@ -886,7 +849,6 @@ sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const } - SvxTabStopItem& SvxTabStopItem::operator=( const SvxTabStopItem& rTSI ) { maTabStops = rTSI.maTabStops; @@ -1046,14 +1008,12 @@ bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const { return new SvxTabStopItem( *this ); } - bool SvxTabStopItem::GetPresentation ( SfxItemPresentation ePres, @@ -1085,7 +1045,6 @@ bool SvxTabStopItem::GetPresentation } - SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 nTabs; @@ -1107,7 +1066,6 @@ SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const } - SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { // Default-Tabs are only expanded for the default Attribute. For complete @@ -1189,7 +1147,6 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart, } - // class SvxFormatSplitItem ------------------------------------------------- SvxFormatSplitItem::~SvxFormatSplitItem() { @@ -1201,7 +1158,6 @@ SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const } - SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteSChar( (sal_Int8)GetValue() ); @@ -1209,7 +1165,6 @@ SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion* } - SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_Int8 bIsSplit; @@ -1218,7 +1173,6 @@ SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const } - bool SvxFormatSplitItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1236,14 +1190,12 @@ bool SvxFormatSplitItem::GetPresentation } - SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const { return new SvxPageModelItem( *this ); } - bool SvxPageModelItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -1303,7 +1255,6 @@ bool SvxPageModelItem::GetPresentation } - SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId ) : SfxBoolItem( nId, bOn ) { @@ -1343,7 +1294,6 @@ bool SvxScriptSpaceItem::GetPresentation( } - SvxHangingPunctuationItem::SvxHangingPunctuationItem( bool bOn, const sal_uInt16 nId ) : SfxBoolItem( nId, bOn ) diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 1ab854c4a474..091637c2ccbc 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -157,7 +157,6 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst, } - SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) : SfxPoolItem( rItem ), @@ -167,14 +166,12 @@ SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) : } - SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const { return new SvxFontListItem( *this ); } - bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -189,7 +186,6 @@ bool SvxFontListItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) } - bool SvxFontListItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -213,7 +209,6 @@ SvxFontItem::SvxFontItem( const sal_uInt16 nId ) : } - SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName, const OUString& aStName, const FontPitch eFontPitch, const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) : @@ -332,7 +327,6 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) } - bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -355,14 +349,12 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const { return new SvxFontItem( *this ); } - SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { bool bToBats = IsStarSymbol( GetFamilyName() ); @@ -389,7 +381,6 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co } - SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding; @@ -426,13 +417,11 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const } - return new SvxFontItem( (FontFamily)_eFamily, aName, aStyle, (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() ); } - bool SvxFontItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -446,7 +435,6 @@ bool SvxFontItem::GetPresentation } - void SvxFontItem::EnableStoreUnicodeNames( bool bEnable ) { bEnableStoreUnicodeNames = bEnable; @@ -472,21 +460,18 @@ SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId } - SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const { return new SvxPostureItem( *this ); } - sal_uInt16 SvxPostureItem::GetValueCount() const { return ITALIC_NORMAL + 1; // ITALIC_NONE also belongs here } - SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -494,7 +479,6 @@ SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nPosture; @@ -503,7 +487,6 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxPostureItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -517,7 +500,6 @@ bool SvxPostureItem::GetPresentation } - OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" ); @@ -583,14 +565,12 @@ bool SvxPostureItem::HasBoolValue() const } - bool SvxPostureItem::GetBoolValue() const { return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE ); } - void SvxPostureItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? ITALIC_NORMAL : ITALIC_NONE) ); @@ -613,44 +593,36 @@ SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) : } - - - bool SvxWeightItem::HasBoolValue() const { return true; } - bool SvxWeightItem::GetBoolValue() const { return (FontWeight)GetValue() >= WEIGHT_BOLD; } - void SvxWeightItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) ); } - sal_uInt16 SvxWeightItem::GetValueCount() const { return WEIGHT_BLACK; // WEIGHT_DONTKNOW does not belong } - SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const { return new SvxWeightItem( *this ); } - SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -658,7 +630,6 @@ SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nWeight; @@ -667,7 +638,6 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxWeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -681,7 +651,6 @@ bool SvxWeightItem::GetPresentation } - OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" ); @@ -750,14 +719,12 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz, } - SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const { return new SvxFontHeightItem( *this ); } - SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { rStrm.WriteUInt16( GetHeight() ); @@ -777,7 +744,6 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) } - SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { @@ -803,7 +769,6 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, } - bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -1036,7 +1001,6 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxFontHeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1064,7 +1028,6 @@ bool SvxFontHeightItem::GetPresentation } - sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const { return (nFileVersion <= SOFFICE_FILEFORMAT_40) @@ -1081,7 +1044,6 @@ bool SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxFontHeightItem::HasMetrics() const { return true; @@ -1143,14 +1105,12 @@ SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp, } - SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const { return new SvxFontWidthItem( *this ); } - SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetWidth() ).WriteUInt16( GetProp() ); @@ -1166,14 +1126,12 @@ bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxFontWidthItem::HasMetrics() const { return true; } - SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { @@ -1188,7 +1146,6 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm, } - bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -1233,7 +1190,6 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - bool SvxFontWidthItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1261,28 +1217,24 @@ SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId } - bool SvxTextLineItem::HasBoolValue() const { return true; } - bool SvxTextLineItem::GetBoolValue() const { return (FontUnderline)GetValue() != UNDERLINE_NONE; } - void SvxTextLineItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) ); } - SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const { SvxTextLineItem* pNew = new SvxTextLineItem( *this ); @@ -1291,14 +1243,12 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const } - sal_uInt16 SvxTextLineItem::GetValueCount() const { return UNDERLINE_DOTTED + 1; // UNDERLINE_NONE also belongs here } - SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -1306,7 +1256,6 @@ SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1315,7 +1264,6 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxTextLineItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1331,7 +1279,6 @@ bool SvxTextLineItem::GetPresentation } - OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const { OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method"); @@ -1415,7 +1362,6 @@ SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nI } - SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const { SvxUnderlineItem* pNew = new SvxUnderlineItem( *this ); @@ -1424,7 +1370,6 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const } - SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1433,7 +1378,6 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const } - OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); @@ -1448,7 +1392,6 @@ SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId } - SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const { SvxOverlineItem* pNew = new SvxOverlineItem( *this ); @@ -1457,7 +1400,6 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const } - SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1466,7 +1408,6 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const } - OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" ); @@ -1481,42 +1422,36 @@ SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 } - bool SvxCrossedOutItem::HasBoolValue() const { return true; } - bool SvxCrossedOutItem::GetBoolValue() const { return (FontStrikeout)GetValue() != STRIKEOUT_NONE; } - void SvxCrossedOutItem::SetBoolValue( bool bVal ) { SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) ); } - sal_uInt16 SvxCrossedOutItem::GetValueCount() const { return STRIKEOUT_DOUBLE + 1; // STRIKEOUT_NONE belongs also here } - SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const { return new SvxCrossedOutItem( *this ); } - SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -1524,7 +1459,6 @@ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* } - SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 eCross; @@ -1533,7 +1467,6 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxCrossedOutItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1547,7 +1480,6 @@ bool SvxCrossedOutItem::GetPresentation } - OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" ); @@ -1596,14 +1528,12 @@ SvxShadowedItem::SvxShadowedItem( const bool bShadowed, const sal_uInt16 nId ) : } - SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const { return new SvxShadowedItem( *this ); } - SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1611,7 +1541,6 @@ SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1620,7 +1549,6 @@ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxShadowedItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1645,14 +1573,12 @@ SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) : } - SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const { return new SvxAutoKernItem( *this ); } - SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1660,7 +1586,6 @@ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -1669,7 +1594,6 @@ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxAutoKernItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1695,14 +1619,12 @@ SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode, } - SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const { return new SvxWordLineModeItem( *this ); } - SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1710,7 +1632,6 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio } - SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const { bool bValue; @@ -1719,7 +1640,6 @@ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxWordLineModeItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1744,14 +1664,12 @@ SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) : } - SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const { return new SvxContourItem( *this ); } - SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -1759,7 +1677,6 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const { bool bValue; @@ -1768,7 +1685,6 @@ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxContourItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1793,14 +1709,12 @@ SvxPropSizeItem::SvxPropSizeItem( const sal_uInt16 nPercent, const sal_uInt16 nI } - SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const { return new SvxPropSizeItem( *this ); } - SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetValue() ); @@ -1808,7 +1722,6 @@ SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt16 nSize; @@ -1817,7 +1730,6 @@ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxPropSizeItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -1838,7 +1750,6 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const sal_uInt16 nId ) : } - SvxBackgroundColorItem::SvxBackgroundColorItem( const Color& rCol, const sal_uInt16 nId ) : SvxColorItem( rCol, nId ) @@ -2016,7 +1927,6 @@ bool SvxColorItem::GetPresentation } - void SvxColorItem::SetValue( const Color& rNewCol ) { mColor = rNewCol; @@ -2032,7 +1942,6 @@ SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) : } - SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol, const rtl_TextEncoding _eFrom, const sal_uInt16 nId ) : @@ -2043,15 +1952,12 @@ SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol, } - - SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const { return new SvxCharSetColorItem( *this ); } - SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetSOStoreTextEncoding(GetCharSet()) ); @@ -2060,7 +1966,6 @@ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio } - SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 cSet; @@ -2071,7 +1976,6 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxCharSetColorItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2092,14 +1996,12 @@ SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) : } - SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const { return new SvxKerningItem( *this ); } - SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteInt16( GetValue() ); @@ -2115,14 +2017,12 @@ bool SvxKerningItem::ScaleMetrics( long nMult, long nDiv ) } - bool SvxKerningItem::HasMetrics() const { return true; } - SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const { short nValue; @@ -2131,7 +2031,6 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxKerningItem::GetPresentation ( SfxItemPresentation ePres, @@ -2196,21 +2095,18 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) : } - sal_uInt16 SvxCaseMapItem::GetValueCount() const { return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1 } - SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const { return new SvxCaseMapItem( *this ); } - SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUChar( GetValue() ); @@ -2218,7 +2114,6 @@ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) } - SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 cMap; @@ -2227,7 +2122,6 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxCaseMapItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2241,7 +2135,6 @@ bool SvxCaseMapItem::GetPresentation } - OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" ); @@ -2291,7 +2184,6 @@ SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) : } - SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, const sal_uInt16 nId ) : SfxEnumItemInterface( nId ), @@ -2303,7 +2195,6 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape, } - SvxEscapementItem::SvxEscapementItem( const short _nEsc, const sal_uInt8 _nProp, const sal_uInt16 nId ) : @@ -2314,7 +2205,6 @@ SvxEscapementItem::SvxEscapementItem( const short _nEsc, } - bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -2324,14 +2214,12 @@ bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const { return new SvxEscapementItem( *this ); } - SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { short _nEsc = GetEsc(); @@ -2348,7 +2236,6 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* } - SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 _nProp; @@ -2358,14 +2245,12 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const } - sal_uInt16 SvxEscapementItem::GetValueCount() const { return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 } - bool SvxEscapementItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2387,7 +2272,6 @@ bool SvxEscapementItem::GetPresentation } - OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" ); @@ -2395,7 +2279,6 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const } - sal_uInt16 SvxEscapementItem::GetEnumValue() const { if ( nEsc < 0 ) @@ -2406,7 +2289,6 @@ sal_uInt16 SvxEscapementItem::GetEnumValue() const } - void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal ) { SetEscapement( (const SvxEscapement)nVal ); @@ -2482,7 +2364,6 @@ SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId } - sal_uInt16 SvxLanguageItem::GetValueCount() const { // #i50205# got rid of class International @@ -2493,14 +2374,12 @@ sal_uInt16 SvxLanguageItem::GetValueCount() const } - SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const { return new SvxLanguageItem( *this ); } - SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetValue() ); @@ -2508,7 +2387,6 @@ SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt16 nValue; @@ -2517,7 +2395,6 @@ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxLanguageItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2580,14 +2457,12 @@ SvxNoLinebreakItem::SvxNoLinebreakItem( const bool bBreak, const sal_uInt16 nId } - SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const { return new SvxNoLinebreakItem( *this ); } - SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -2595,7 +2470,6 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion } - SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const { bool bValue; @@ -2604,7 +2478,6 @@ SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxNoLinebreakItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2625,14 +2498,12 @@ SvxNoHyphenItem::SvxNoHyphenItem( const bool bHyphen, const sal_uInt16 nId ) : } - SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const { return new SvxNoHyphenItem( *this ); } - SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -2640,7 +2511,6 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ } - SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const { bool bValue; @@ -2649,7 +2519,6 @@ SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const } - bool SvxNoHyphenItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2677,20 +2546,17 @@ SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) : } - SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) : SvxColorItem( rCopy ) { } - SvxLineColorItem::~SvxLineColorItem() { } - bool SvxLineColorItem::GetPresentation ( SfxItemPresentation ePres, @@ -2713,14 +2579,12 @@ SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) : } - SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const { return new SvxBlinkItem( *this ); } - SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteBool( GetValue() ); @@ -2728,7 +2592,6 @@ SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c } - SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 nState; @@ -2737,7 +2600,6 @@ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const } - bool SvxBlinkItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2763,14 +2625,12 @@ SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue, } - SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const { return new SvxEmphasisMarkItem( *this ); } - SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { @@ -2779,7 +2639,6 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, } - SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const { sal_uInt16 nValue; @@ -2788,7 +2647,6 @@ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const } - bool SvxEmphasisMarkItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -2812,7 +2670,6 @@ bool SvxEmphasisMarkItem::GetPresentation } - bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index a5c271326f23..86c260a559bb 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; - SfxPoolItem* SvxWritingModeItem::CreateDefault() { return new SvxWritingModeItem(css::text::WritingMode_LR_TB, 0);} SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich ) diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index 1b100b55dde7..0fe0bcedd360 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::xml; - SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) { diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 64a07c99e728..364116ef9949 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -166,7 +166,6 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, } - SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, Reference< XHyphenator > &xHyphenator, const bool bStart, const bool bOther ) : @@ -186,7 +185,6 @@ SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, } - sal_Int16 SvxSpellWrapper::CheckSpellLang( Reference< XSpellChecker1 > xSpell, sal_Int16 nLang) { @@ -238,31 +236,23 @@ sal_Int16 SvxSpellWrapper::CheckHyphLang( } - - void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ ) { // Here, the necessary preparations be made for SpellContinue in the } // given area. - - bool SvxSpellWrapper::HasOtherCnt() { return false; // Is there a special area? } - - bool SvxSpellWrapper::SpellMore() { return false; // Should additional documents be examined? } - - void SvxSpellWrapper::SpellEnd() { // Area is complete, tidy up if necessary @@ -412,7 +402,6 @@ bool SvxSpellWrapper::SpellNext( ) } - Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() { Reference< XDictionary > xDic; @@ -456,7 +445,6 @@ Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() } - bool SvxSpellWrapper::FindSpellError() { ShowLanguageErrors(); @@ -515,5 +503,4 @@ bool SvxSpellWrapper::FindSpellError() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index ebde75837dc7..5abefba26ed8 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; - OutlinerView::OutlinerView( Outliner* pOut, vcl::Window* pWin ) { pOwner = pOut; @@ -672,7 +671,6 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj ) } - void OutlinerView::Cut() { if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) { @@ -1196,12 +1194,9 @@ void OutlinerView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich, bo } - - // ====================== Simple pass-through ======================= - void OutlinerView::InsertText( const OUString& rNew, bool bSelect ) { if( pOwner->bFirstParaIsEmpty ) diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index 09a98b43d15c..1b98adea6e99 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -64,7 +64,6 @@ OutlinerParaObject *TextChainingUtils::JuxtaposeParaObject( } - return pOutl->CreateParaObject(); } diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 01cc8b86c361..a4e9d40dbe3a 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -200,7 +200,6 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet, } - void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) { DBG_ASSERT( pSet, "A SfxItemSet has to be provided as argument!" ); diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index ada29d736e07..3d83bf8fa7c4 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <utility> #include <vector> @@ -35,7 +32,6 @@ #include <com/sun/star/uno/Reference.hxx> - // Project-local header @@ -300,7 +296,6 @@ bool SvxAccessibleTextIndex::IsEditableRange( const SvxAccessibleTextIndex& rEnd } - SvxEditSourceAdapter::SvxEditSourceAdapter() : mbEditSourceValid( false ) { } diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx index f638ecd23ced..4e48ffa1d10b 100644 --- a/editeng/source/uno/unoedsrc.cxx +++ b/editeng/source/uno/unoedsrc.cxx @@ -29,13 +29,11 @@ void SvxEditSource::addRange( SvxUnoTextRangeBase* ) } - void SvxEditSource::removeRange( SvxUnoTextRangeBase* ) { } - const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const { static SvxUnoTextRangeBaseList gList; @@ -43,19 +41,16 @@ const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const } - SvxTextForwarder::~SvxTextForwarder() { } - SvxViewForwarder::~SvxViewForwarder() { } - SvxEditSource::~SvxEditSource() { } diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 368513d03ae1..fd76b7a9b948 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -227,5 +227,4 @@ uno::Any SvxUnoFontDescriptor::getPropertyDefault( SfxItemPool* pPool ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx index b3ab33dcad53..793f979a55fa 100644 --- a/editeng/source/uno/unofored.cxx +++ b/editeng/source/uno/unofored.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star; - SvxEditEngineForwarder::SvxEditEngineForwarder( EditEngine& rEngine ) : rEditEngine( rEngine ) { @@ -502,5 +501,4 @@ void SvxEditEngineForwarder::CopyText(const SvxTextForwarder& rSource) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx index d36cacbdc3d0..d3be942fe710 100644 --- a/editeng/source/uno/unoforou.cxx +++ b/editeng/source/uno/unoforou.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star; - SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, bool bOutlText /* = false */ ) : rOutliner( rOutl ), bOutlinerText( bOutlText ), @@ -577,8 +576,6 @@ void SvxOutlinerForwarder::CopyText(const SvxTextForwarder& rSource) } - - sal_Int32 SvxTextForwarder::GetNumberingStartValue( sal_Int32 ) { return -1; @@ -598,5 +595,4 @@ void SvxTextForwarder::SetParaIsNumberingRestart( sal_Int32, bool ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 0034b3ebcb1b..4c369844ccf6 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -74,7 +74,6 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID) } - void SvxItemPropertySet::ClearAllUsrAny() { for ( size_t i = 0, n = aCombineList.size(); i < n; ++i ) @@ -83,7 +82,6 @@ void SvxItemPropertySet::ClearAllUsrAny() } - bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) { bool bConvert = true; // the default is that all metric items must be converted @@ -94,7 +92,6 @@ bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) } - uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) { uno::Any aVal; @@ -248,7 +245,6 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } - void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal ) const { uno::Any* pUsrAny = GetUsrAnyForID(pMap->nWID); @@ -259,14 +255,12 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa } - const SfxItemPropertySimpleEntry* SvxItemPropertySet::getPropertyMapEntry(const OUString &rName) const { return m_aPropertyMap.getByName( rName ); } - uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInfo() const { if( !m_xInfo.is() ) @@ -275,7 +269,6 @@ uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInf } - #ifndef TWIPS_TO_MM #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #endif @@ -321,7 +314,6 @@ void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) th } - /** converts the given any with a metric from 100th/mm to the given metric if needed */ void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, uno::Any & rMetric ) throw() { diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 73a44640b1b7..181ff4a4d9ff 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -2365,8 +2365,6 @@ sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rI } - - SvxDummyTextSource::~SvxDummyTextSource() { }; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index c9aef52f4294..392875846f81 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -138,7 +138,6 @@ SvxTextForwarder* SvxEditEngineSource::GetTextForwarder() } - void SvxEditEngineSource::UpdateData() { } @@ -312,7 +311,6 @@ void SAL_CALL SvxSimpleUnoModel::removeEventListener( const css::uno::Reference< } - class SvxXMLTextExportComponent : public SvXMLExport { public: @@ -336,7 +334,6 @@ private: }; - SvxXMLTextExportComponent::SvxXMLTextExportComponent( const css::uno::Reference< css::uno::XComponentContext >& xContext, EditEngine* pEditEngine, diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 53ea51b4d18f..8cedcbc3a8e9 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -52,8 +52,6 @@ using namespace cppu; using namespace xmloff::token; - - class SvxXMLTextImportContext : public SvXMLImportContext { public: @@ -69,7 +67,6 @@ private: }; - SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, const uno::Reference< XText >& xText ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText ) { @@ -104,7 +101,6 @@ SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPre } - class SvxXMLXTextImportComponent : public SvXMLImport { public: @@ -119,7 +115,6 @@ private: }; - SvxXMLXTextImportComponent::SvxXMLXTextImportComponent( const css::uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< XText > & xText ) diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index fcd2ff85361d..bba9f2684771 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -404,8 +404,6 @@ void SAL_CALL OCommonEmbeddedObject::release() } - - uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID() throw ( uno::RuntimeException, std::exception ) { diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 52107129d012..e260d63436a4 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star; - uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< beans::PropertyValue >& aMedDescr, bool bCanUseDocumentBaseURL ) { @@ -713,7 +712,6 @@ OUString OCommonEmbeddedObject::GetBaseURLFrom_Impl( } - void OCommonEmbeddedObject::SwitchDocToStorage_Impl( const uno::Reference< document::XStorageBasedDocument >& xDoc, const uno::Reference< embed::XStorage >& xStorage ) { xDoc->switchToStorage( xStorage ); diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index e89695e25f5a..843106ad74b5 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -1113,7 +1113,6 @@ void SAL_CALL DocumentHolder::disposing( const css::lang::EventObject& aSource ) } - void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) { diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index c37ae995b879..ef752b83d8d0 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -299,7 +299,6 @@ Interceptor::queryDispatches( } - //XDispatchProviderInterceptor uno::Reference< frame::XDispatchProvider > SAL_CALL diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 8ccff0c81074..6e171f21ebc3 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; - uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames() { uno::Sequence< OUString > aRet(2); diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 9fdeb18b80a6..25f5528590e3 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; - OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, const uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName ) @@ -446,7 +445,6 @@ void SAL_CALL OleEmbeddedObject::removeStateChangeListener( } - void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership ) throw ( util::CloseVetoException, uno::RuntimeException, std::exception ) diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 5a199e75cbb0..96fa642d63ff 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -1711,7 +1711,6 @@ OUString SAL_CALL OleEmbeddedObject::getEntryName() } - void SAL_CALL OleEmbeddedObject::storeOwn() throw ( embed::WrongStateException, io::IOException, diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx index fc54728de7b1..458c085ae111 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx @@ -49,7 +49,6 @@ uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::impl_staticCreateSe } - uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstance() throw ( uno::Exception, uno::RuntimeException) diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index a0ea9919ffe7..852f00e8e2b5 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -193,7 +193,6 @@ void DocumentHolder::OnPosRectChanged(LPRECT lpRect) const } - void DocumentHolder::DisableInplaceActivation(BOOL b) { m_bAllowInPlace = ! b; @@ -1268,7 +1267,6 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWin } - sal_Bool SAL_CALL DocumentHolder::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw( css::uno::RuntimeException @@ -1409,7 +1407,6 @@ DocumentHolder::notifyTermination( } - void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException) { diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx index 778522778ccb..986d6fdef991 100644 --- a/embedserv/source/embed/ed_ioleobject.cxx +++ b/embedserv/source/embed/ed_ioleobject.cxx @@ -244,7 +244,6 @@ STDMETHODIMP EmbedDocument_Impl::DoVerb( } - STDMETHODIMP EmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** /*ppEnumOleVerb*/ ) { return OLE_S_USEREG; diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 64513b4f8c52..eae7ae0f555e 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -163,7 +163,6 @@ HRESULT copyXTempOutToIStream( uno::Reference< io::XOutputStream > xTempOut, ISt } - // EmbedDocument_Impl @@ -921,7 +920,6 @@ STDMETHODIMP EmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName ) } - LockedEmbedDocument_Impl EmbeddedDocumentInstanceAccess_Impl::GetEmbedDocument() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -935,7 +933,6 @@ void EmbeddedDocumentInstanceAccess_Impl::ClearEmbedDocument() } - LockedEmbedDocument_Impl::LockedEmbedDocument_Impl() : m_pEmbedDocument( NULL ) {} diff --git a/embedserv/source/embed/iipaobj.cxx b/embedserv/source/embed/iipaobj.cxx index 43ecad4c0204..081a6c301eb9 100644 --- a/embedserv/source/embed/iipaobj.cxx +++ b/embedserv/source/embed/iipaobj.cxx @@ -21,7 +21,6 @@ #include "embeddoc.hxx" - CIIAObj::CIIAObj(DocumentHolder* pDocHolder) : m_refCount( 0L ), m_rDocHolder( pDocHolder ) diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index 58fa93526501..0a82ba9f12a4 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -25,11 +25,9 @@ using namespace ::com::sun::star; - #define IUL 6 - uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL); class StatusChangeListenerContainer @@ -89,7 +87,6 @@ void SAL_CALL Interceptor::dispose() } - Interceptor::Interceptor( const ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl >& xOleAccess, DocumentHolder* pDocH, @@ -476,7 +473,6 @@ Interceptor::queryDispatches( } - //XDispatchProviderInterceptor uno::Reference< frame::XDispatchProvider > SAL_CALL diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index 113209448672..209163d1dad2 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -98,7 +98,6 @@ void o2u_attachCurrentThread() } - // EmbedServer_Impl EmbedServer_Impl::EmbedServer_Impl( const uno::Reference<lang::XMultiServiceFactory>& xFactory): diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx index 303f49a8f347..a49b1b9e0bf9 100644 --- a/embedserv/source/embed/syswinwrapper.cxx +++ b/embedserv/source/embed/syswinwrapper.cxx @@ -48,7 +48,6 @@ typedef CHatchWin *PCHatchWin; void DrawShading(LPRECT prc, HDC hDC, UINT cWidth); - winwrap::CWindow::CWindow(HINSTANCE hInst) { m_hInst=hInst; @@ -65,7 +64,6 @@ winwrap::CWindow::~CWindow() } - /* * CWindow::Window * @@ -82,7 +80,6 @@ HWND winwrap::CWindow::Window() } - /* * CWindow::Instance * @@ -131,8 +128,6 @@ BOOL winwrap::HatchWindowRegister(HINSTANCE hInst) } - - /* * CHatchWin:CHatchWin * CHatchWin::~CHatchWin @@ -176,7 +171,6 @@ CHatchWin::~CHatchWin() } - /* * CHatchWin::Init * @@ -305,7 +299,6 @@ void CHatchWin::RectsSet(LPRECT prcPos, LPRECT prcClip) } - /* * CHatchWin::ChildSet * @@ -335,7 +328,6 @@ void CHatchWin::ChildSet(HWND hWndKid) } - /* * CHatchWin::ShowHatch * @@ -367,7 +359,6 @@ void CHatchWin::ShowHatch(BOOL fHatch) } - /* * HatchWndProc * diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx index d40e69a29174..a202e94cc041 100644 --- a/embedserv/source/embed/tracker.cxx +++ b/embedserv/source/embed/tracker.cxx @@ -94,7 +94,6 @@ HBRUSH HalftoneBrush() } - void DrawDragRect( HDC hDC,LPRECT lpRect,SIZE size, LPRECT lpRectLast,SIZE sizeLast, @@ -328,7 +327,6 @@ BOOL Tracker::SetCursor(HWND pWnd, UINT nHitTest) const } - BOOL Tracker::Track(HWND hWnd,POINT point,BOOL bAllowInvert, HWND hWndClipTo) { @@ -781,7 +779,6 @@ int Tracker::HitTestHandles(POINT point) const } - void Tracker::GetModifyPointers( int nHandle, int** ppx, int** ppy, int* px, int* py) { diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx index ac226108ea01..59013074ac04 100644 --- a/embedserv/source/inc/intercept.hxx +++ b/embedserv/source/inc/intercept.hxx @@ -71,7 +71,6 @@ public: dispose() throw(css::uno::RuntimeException); - //XDispatch virtual void SAL_CALL dispatch( diff --git a/embedserv/source/inc/syswinwrapper.hxx b/embedserv/source/inc/syswinwrapper.hxx index 422dff9c3a4a..08e39f8c98b6 100644 --- a/embedserv/source/inc/syswinwrapper.hxx +++ b/embedserv/source/inc/syswinwrapper.hxx @@ -60,7 +60,6 @@ namespace winwrap { }; - class Tracker { public: // Constructors @@ -130,7 +129,6 @@ protected: }; - //Width of the border #define HATCHWIN_BORDERWIDTHDEFAULT 4 diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 5f70df9138d1..31d217424946 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -160,11 +160,9 @@ protected: }; // namespace inprocserv - // Entry points - extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ ) { if (dwReason == DLL_PROCESS_ATTACH) @@ -239,7 +237,6 @@ namespace inprocserv // InprocCountedObject_Impl implementation - InprocCountedObject_Impl::InprocCountedObject_Impl() { g_nObj++; @@ -255,7 +252,6 @@ InprocCountedObject_Impl::~InprocCountedObject_Impl() // InprocEmbedProvider_Impl implementation - InprocEmbedProvider_Impl::InprocEmbedProvider_Impl( const GUID& guid ) : m_refCount( 0 ) , m_guid( guid ) diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx index 912efc4dc160..154da716c7d7 100644 --- a/embedserv/source/inprocserv/inprocembobj.cxx +++ b/embedserv/source/inprocserv/inprocembobj.cxx @@ -1505,7 +1505,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, LONG linde } - // IOleWindow methods STDMETHODIMP InprocEmbedDocument_Impl::GetWindow( HWND *phwnd ) @@ -1672,7 +1671,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Invoke( DISPID dispIdMember, REFIID riid, } - // InternalCacheWrapper diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index ef72e0bd3802..db2acf60d876 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -49,7 +49,6 @@ using namespace cppu; using namespace osl; - #define SERVICENAME "com.sun.star.script.EventAttacher" #define IMPLNAME "com.sun.star.comp.EventAttacher" @@ -106,7 +105,6 @@ Reference< XInterface > createAllListenerAdapter } - // InvocationToAllListenerMapper InvocationToAllListenerMapper::InvocationToAllListenerMapper ( const Reference< XIdlClass >& ListenerType, const Reference< XAllListener >& AllListener, const Any& Helper ) @@ -281,7 +279,6 @@ private: }; - EventAttacherImpl::EventAttacherImpl( const Reference< XComponentContext >& rxContext ) : m_xContext( rxContext ) { @@ -413,7 +410,6 @@ Reference< XInvocationAdapterFactory2 > EventAttacherImpl::getInvocationAdapterS } - //*** Private helper methods *** Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception ) { @@ -426,8 +422,6 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception ) } - - // Implementation of an EventAttacher-related AllListeners, which brings // a few Events to a general AllListener class FilterAllListenerImpl : public WeakImplHelper< XAllListener > @@ -555,7 +549,6 @@ void FilterAllListenerImpl::disposing(const EventObject& ) } - Reference< XEventListener > EventAttacherImpl::attachListener ( const Reference< XInterface >& xObject, @@ -915,5 +908,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL evtatt_component_getFactory( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 97706e295dcb..821b1656ef0d 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -30,7 +30,6 @@ #include <vcl/waitobj.hxx> - namespace abp { diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 486f89d85259..578e95750a8e 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -91,7 +91,6 @@ namespace abp struct PackageAccessControl { }; - static Reference< XDatabaseContext > lcl_getDataSourceContext( const Reference< XComponentContext >& _rxContext ) { Reference<XDatabaseContext> xContext = DatabaseContext::create(_rxContext); diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 3fdc9710616b..8df7f2c6df91 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace vcl { class Window; } - namespace abp { @@ -171,7 +170,6 @@ namespace abp css::uno::Reference< css::beans::XPropertySet > getDataSource() const; - /** set a new data source. <p>Available to selected clients only</p> */ diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 4c8fb611834f..a551da9ff075 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -58,7 +58,6 @@ namespace abp { - bool invokeDialog( const Reference< XComponentContext >& _rxORB, class vcl::Window* _pParent, const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) { @@ -279,12 +278,10 @@ namespace abp } // namespace fieldmapping - namespace addressconfig { - void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext, const OUString& _rDataSourceName, const OUString& _rTableName ) { @@ -322,7 +319,6 @@ namespace abp } // namespace addressconfig - } // namespace abp diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index 5f1b539dd46a..3cbe2919bb3a 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.hxx @@ -43,12 +43,10 @@ namespace abp { - namespace fieldmapping { - /** invokes the field mapping dialog @param _rxORB service factory to use for creating UNO services @@ -88,12 +86,10 @@ namespace abp } // namespace fieldmapping - namespace addressconfig { - /** writes the data source / table name given into the configuration, to where the template documents expect it. */ @@ -113,7 +109,6 @@ namespace abp } // namespace addressconfig - } // namespace abp diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index a59108e41491..b6b6d5986380 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -26,8 +26,6 @@ #include <sal/macros.h> - - STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index bf934076280a..41c6917ac1b2 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -34,8 +34,6 @@ #define STAROFFICE_WINDOWCLASS "SOParentWindow" - - void OutputError_Impl( HWND hw, HRESULT ErrorCode ) { void* sMessage; @@ -1163,6 +1161,4 @@ HRESULT CSOActiveX::GetURL( const OLECHAR* url, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx index 86d15046c723..e752685e25f8 100644 --- a/extensions/source/activex/SOComWindowPeer.cxx +++ b/extensions/source/activex/SOComWindowPeer.cxx @@ -25,8 +25,6 @@ #include <sal/macros.h> - - STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index fe398a576aee..2cdd23e5939c 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -28,8 +28,6 @@ #include <sal/macros.h> - - STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index 2a73949cb01e..ffb1c6653013 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -350,7 +350,6 @@ STDAPI DllRegisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit, co } - // DllUnregisterServer - Removes entries from the system registry HRESULT DeleteKeyTree( HKEY hkey, const char* pPath, REGSAM nKeyAccess ) { @@ -470,7 +469,6 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) } - // DllRegisterServerDoc - Adds entries to the system registry #define SUPPORTED_MSEXT_NUM 7 @@ -573,7 +571,6 @@ STDAPI DllRegisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) } - // DllUnregisterServerDoc - Removes entries from the system registry STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 590e90759515..c260f8efcbd0 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -28,7 +28,6 @@ struct Mapping; typedef std::vector<std::unique_ptr<Mapping> > MappingArray; - #define COLUMN_COUNT 31 #define IDENTIFIER_POS 0 #define AUTHORITYTYPE_POS 1 diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 9828ae669be0..ce8774189af4 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -679,5 +679,4 @@ void BibliographyLoader::removeVetoableChangeListener( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index 808b815219da..f3a393c3b576 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -23,7 +23,6 @@ #include <tools/resid.hxx> - class BibResId : public ResId { public: diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 88ac20693f62..74de227ff6de 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -46,7 +46,6 @@ namespace bib { - BibView::BibView( vcl::Window* _pParent, BibDataManager* _pManager, WinBits _nStyle ) :BibWindow( _pParent, _nStyle ) ,m_pDatMan( _pManager ) diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 10541f57fbf6..fb24272e7bb5 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -235,7 +235,6 @@ class MappingDialog_Impl : public ModalDialog bool bModified; - DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void); diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 224152dcdd06..a61eae4fe39e 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -133,7 +133,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - css::uno::Reference< css::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc); css::uno::Reference< css::awt::XControlModel > updateGridModel(); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 23bda2b9b629..cf581286e8a4 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -551,7 +551,6 @@ IMPL_LINK_NOARG_TYPED( BibToolBar, OptionsChanged_Impl, LinkParamNone*, void ) } - IMPL_LINK_NOARG_TYPED( BibToolBar, SettingsChanged_Impl, VclSimpleEvent&, void ) { // Check if toolbar button size have changed and we have to use system settings @@ -572,7 +571,6 @@ void BibToolBar::RebuildToolbar() } - void BibToolBar::ApplyImageList() { ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 164eee6f4d10..922cb7886852 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -175,8 +175,6 @@ class BibToolBar: public ToolBox }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx index a93ea4014049..2795146649d0 100644 --- a/extensions/source/config/ldap/componentdef.cxx +++ b/extensions/source/config/ldap/componentdef.cxx @@ -24,7 +24,6 @@ using namespace extensions::config::ldap ; - static uno::Reference<uno::XInterface> SAL_CALL createLdapUserProfileBe( const uno::Reference<uno::XComponentContext>& aContext) { return * new LdapUserProfileBe(aContext) ; diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 016f66e581aa..d65a946eea7d 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -251,7 +251,6 @@ void LdapConnection::initConnection() } - OUStringBuffer filter( "(&(objectclass=" ); filter.append( mLdapDefinition.mUserObjectClass ).append(")(") ; @@ -298,7 +297,6 @@ void LdapConnection::initConnection() } - } } } // extensions.config.ldap /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 48704397be63..ffe47dad7baf 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -124,7 +124,6 @@ namespace dbp } // namespace dbp - #endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_COMMONPAGESDBP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx index 63c035596d53..548949e8bfa9 100644 --- a/extensions/source/dbpilots/dbptools.hxx +++ b/extensions/source/dbpilots/dbptools.hxx @@ -35,7 +35,6 @@ namespace dbp } // namespace dbp - #endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 87414f1a4de0..de212fe81ba1 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -269,7 +269,6 @@ namespace COMPMOD_NAMESPACE } - } // namespace COMPMOD_NAMESPACE diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx index 281ac5f4c622..c483d8ac7b29 100644 --- a/extensions/source/ole/jscriptclasses.hxx +++ b/extensions/source/ole/jscriptclasses.hxx @@ -25,7 +25,6 @@ #include "comifaces.hxx" - // Sequences are represented by prepending "[]", e.g. []char, [][]byte, [][][]object, etc. // To make a JScriptValue object to an out parameter, call diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index 346de1e95496..017889f93115 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -84,7 +84,6 @@ Mutex* getBridgeMutex(); } // end namespace - #endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index f5709e982775..e4f93e72f227 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -1177,8 +1177,6 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, } - - // XInitialization void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) { @@ -1550,7 +1548,6 @@ Reference<XInterface> IUnknownWrapper_Impl::createComWrapperInstance() } - void IUnknownWrapper_Impl::getMethodInfo(const OUString& sName, TypeDescription& methodInfo) { TypeDescription desc= getInterfaceMemberDescOfCurrentCall(sName); @@ -1642,7 +1639,6 @@ sal_Bool IUnknownWrapper_Impl::isJScriptObject() } - /** @internal The function ultimately calls IDispatch::Invoke on the wrapped COM object. The COM object does not implement UNO Interfaces ( via IDispatch). This diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 2abd1e48b371..0b617cb61ad6 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -50,7 +50,6 @@ namespace ole_adapter { - typedef std::unordered_map<OUString, pair<DISPID, unsigned short>, OUStringHash> DispIdMap; typedef std::unordered_multimap<OUString, unsigned int, OUStringHash> TLBFuncIndexMap; diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index 81265b5ed7d6..95b3badf5ae2 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -493,7 +493,6 @@ Reference< XInterface > OleConverter_Impl2::createComWrapperInstance() } - /***************************************************************************** class implementation OleClient_Impl @@ -622,7 +621,6 @@ Reference< XInterface > OleClient_Impl::createComWrapperInstance( ) } - /***************************************************************************** class implementation OleServer_Impl @@ -697,7 +695,6 @@ sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUI } - } // end namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 7c4a8c3797aa..ce3488e5559a 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -89,8 +89,6 @@ inline void reduceRange( Any& any); #endif - - // createUnoObjectWrapper gets a wrapper instance by calling createUnoWrapperInstance // and initializes it via XInitialization. The wrapper object is required to implement // XBridgeSupplier so that it can convert itself to IDispatch. @@ -268,7 +266,6 @@ bool convertSelfToCom( T& unoInterface, VARIANT * pVar) } - // Gets the invocation factory depending on the Type in the Any. // The factory can be created by a local or remote multi service factory. // In case there is a remote multi service factory available there are diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx index 67c725cb83f2..af067eb66db3 100644 --- a/extensions/source/ole/unoobjw.hxx +++ b/extensions/source/ole/unoobjw.hxx @@ -49,7 +49,6 @@ namespace ole_adapter { - struct hash_IUnknown_Impl { size_t operator()(const IUnknown* p) const @@ -67,7 +66,6 @@ struct equal_to_IUnknown_Impl }; - struct MemberInfo { MemberInfo() : flags(0), name() {} diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index dd6364b76633..6d46ab8991a2 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -167,5 +167,4 @@ STDMETHODIMP UnoTypeWrapper::get_Name(BSTR *pVal) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/windata.cxx b/extensions/source/ole/windata.cxx index a2455e6ed055..98afa2b623a1 100644 --- a/extensions/source/ole/windata.cxx +++ b/extensions/source/ole/windata.cxx @@ -24,7 +24,6 @@ namespace ole_adapter { - } diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx index 5e6c30abcefe..2f76a2cf555f 100644 --- a/extensions/source/ole/windata.hxx +++ b/extensions/source/ole/windata.hxx @@ -200,7 +200,6 @@ public: }; - } #endif diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 875c7b490962..b710e871e533 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1278,5 +1278,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 7e09dd24ff44..5be841cc2faa 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -64,7 +64,6 @@ namespace pcr }; - } // namespace pcr diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index be669773863f..8181405d8411 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -223,7 +223,6 @@ namespace pcr } - void CachedInspectorUI::checkDisposed() const { if ( isDisposed() ) diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index e1b1c6a59f9a..0bac31f580c3 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -34,7 +34,6 @@ namespace pcr { - //= DefaultHelpProvider typedef ::cppu::WeakImplHelper < css::inspection::XPropertyControlObserver diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index e8e04da8f641..a7fe7a551f2e 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= EditPropertyHandler class EditPropertyHandler; diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index fe8d7da6e9af..f88ae0365e67 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= IPropertyEnumRepresentation class SAL_NO_VTABLE IPropertyEnumRepresentation : public salhelper::SimpleReferenceObject diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index e730a99468d8..cc4b79ed43f0 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -37,7 +37,6 @@ namespace pcr { - //= EventDescription typedef sal_Int32 EventId; diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index bef80878706a..831a6799508b 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -396,7 +396,6 @@ namespace pcr } - // font wordline mode eState = _rSet.GetItemState(CFID_WORDLINEMODE); @@ -409,7 +408,6 @@ namespace pcr } - // text color eState = _rSet.GetItemState(CFID_CHARCOLOR); diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index 458905115fe2..707a35e4d2f8 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -29,7 +29,6 @@ namespace pcr { - //= ControlCharacterDialog class ControlCharacterDialog : public SfxTabDialog diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index c853bcdfeba0..f805cac7276f 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -993,7 +993,6 @@ namespace pcr } - LineDescriptor aDescriptor; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); aDescriptor.DisplayName = sDisplayName; @@ -1004,7 +1003,6 @@ namespace pcr aDescriptor.Control.clear(); - bool bNeedDefaultStringIfVoidAllowed = false; TypeClass eType = aProperty.Type.getTypeClass(); diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index dea7179269ce..7950566b70f7 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -42,7 +42,6 @@ namespace pcr { - //= ComponentClassification enum ComponentClassification diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 49decd0f0a81..b08276bef45a 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -30,7 +30,6 @@ namespace pcr { - //= ServiceDescriptor struct ServiceDescriptor diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index c499dcb6b72e..fbd6eb28fd6f 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/sdb/SQLContext.hpp> - namespace pcr { diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 8bb948ff06b5..8df6deee9e15 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -549,7 +549,6 @@ namespace pcr } - const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { // Initialization diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 82b9f41de475..b228e232429e 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -41,7 +41,6 @@ namespace pcr { - //= PropertyHandlerHelper class PropertyHandlerHelper diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index 1b27429a9323..11ba385a040e 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= InspectorHelpWindow class InspectorHelpWindow : public vcl::Window diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 2f1f564fc465..00b4e37fec23 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= OLineDescriptor struct OLineDescriptor : public css::inspection::LineDescriptor diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 64c69c2087ef..d7c6d2041971 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -25,7 +25,6 @@ namespace pcr { - //= NewDataTypeDialog diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index a31a5bcbe912..65b60ab8c10a 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -220,7 +220,6 @@ namespace pcr } // namespace pcr - extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel() { ::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration; diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index d45d3e5d3a22..d14964f58416 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -162,8 +162,6 @@ namespace pcr } - - } // namespace pcr diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index bfd05f67525d..3abbb8ff8bc6 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -29,7 +29,6 @@ namespace pcr { - //= OTabOrderDialog class OTabOrderDialog; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 80a24fdd3abd..7a478149a8cc 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1141,7 +1141,6 @@ namespace pcr _rDescriptor.assignFrom( handler->second->describePropertyLine( _rProperty.Name, this ) ); - _rDescriptor.xPropertyHandler = handler->second; _rDescriptor.sName = _rProperty.Name; _rDescriptor.aValue = _rDescriptor.xPropertyHandler->getPropertyValue( _rProperty.Name ); @@ -1747,5 +1746,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx index 61ba188e72fa..982e812475b3 100644 --- a/extensions/source/propctrlr/propcontrolobserver.hxx +++ b/extensions/source/propctrlr/propcontrolobserver.hxx @@ -26,7 +26,6 @@ namespace pcr { - //= IPropertyControlObserver /** non-UNO version of the XPropertyControlObserver diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index 36a0b875fa4a..df5baf5c2bcd 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -41,7 +41,6 @@ namespace pcr { - //= PropertyComposer typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index 6f90086f9695..3c9cfc39d69c 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.cxx @@ -126,7 +126,6 @@ namespace pcr } - } // namespace pcr diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index efdcb18e59ee..aa615184f77c 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= PropertyControlExtender struct PropertyControlExtender_Data; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 057a4d550f55..31352986c5fc 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -344,8 +344,6 @@ namespace pcr } - - void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { sal_uInt16 nCount = m_aTabControl->GetPageCount(); @@ -534,5 +532,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index dc5dba484fe9..7b1ee3b2b2de 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -30,7 +30,6 @@ namespace pcr { - //= IPropertyInfoService class SAL_NO_VTABLE IPropertyInfoService diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index 0eff3c10a42b..dcf52e4d10b2 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= PropertyEventTranslation typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 447f3c99ee75..cd9ee5f3fca3 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -27,7 +27,6 @@ namespace pcr { - class IPropertyLineListener { public: diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx index a293c3ecb134..6a8ee54248bd 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.hxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= PushButtonNavigation class PushButtonNavigation diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 0d993c46c14e..36ede0e9d998 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -33,7 +33,6 @@ namespace pcr { - // OSelectLabelDialog class OSelectLabelDialog diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index f5422f0f8eed..95db7bb1feaf 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -44,7 +44,6 @@ namespace pcr { - //= ListLikeControlWithModifyHandler /** Very small helper class which adds a SetModifyHdl to a ListBox-derived class, diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 1be13ed9f42b..10618afd9feb 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -614,7 +614,6 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString } // pcr - // component helper namespace namespace comp_StringRepresentation { diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 1969013405c7..7a64cc35ba07 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -36,7 +36,6 @@ namespace pcr { - //= SubmissionHelper class SubmissionHelper : public EFormsHelper diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 48decec8e889..c254ade89c9c 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -40,7 +40,6 @@ namespace pcr { - //= TabOrderListBox class TabOrderListBox : public SvTreeListBox @@ -59,7 +58,6 @@ namespace pcr }; - //= TabOrderDialog class TabOrderDialog : public ModalDialog diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 2c21bf7cefaa..b320a9345040 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= NumberFormatSampleField class NumberFormatSampleField : public FormattedField diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index b08c65eed05c..0732abb1f5ae 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -38,7 +38,6 @@ namespace pcr { - //= XSDDataType class XSDDataType : public salhelper::SimpleReferenceObject diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 45ac34e76410..8fcd67cc6d4d 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -58,7 +58,6 @@ struct OutData }; - static void openFile( OutData& out ) { char * effective_url; @@ -102,7 +101,6 @@ static void openFile( OutData& out ) } - static inline OString getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName) { @@ -113,7 +111,6 @@ getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, cons } - static inline sal_Int32 getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName, sal_Int32 nDefault=-1) @@ -127,7 +124,6 @@ getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess, } - static size_t write_function( void *ptr, size_t size, size_t nmemb, void *stream ) { @@ -145,7 +141,6 @@ write_function( void *ptr, size_t size, size_t nmemb, void *stream ) } - static int progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, double ulnow ) { @@ -178,7 +173,6 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, } - void Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const { @@ -222,7 +216,6 @@ Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) } - bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort) { /* Need to investigate further whether it is necessary to call @@ -340,7 +333,6 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal } - bool Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir) { @@ -428,7 +420,6 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe } - void Download::stop() { diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 82e37cf0f570..cc80df5d4138 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -95,7 +95,6 @@ OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloa } - namespace { @@ -117,15 +116,12 @@ static inline OUString getBaseInstallation() #endif - inline bool isObsoleteUpdateInfo(const OUString& rBuildId) { return !rBuildId.equals(getBuildId()) && !rBuildId.isEmpty(); } - - OUString getImageFromFileName(const OUString& aFile) { #ifndef WNT @@ -200,8 +196,6 @@ OUString getImageFromFileName(const OUString& aFile) } - - static uno::Reference< beans::XPropertySet > createMenuBarUI( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< task::XJob >& xJob) @@ -226,9 +220,6 @@ static uno::Reference< beans::XPropertySet > createMenuBarUI( } - - - typedef sal_Bool (* OnlineCheckFunc) (); class UpdateCheckThread : public WorkerThread @@ -356,7 +347,6 @@ private: }; - UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext ) : m_aCondition(rCondition), @@ -369,14 +359,11 @@ UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition, } - UpdateCheckThread::~UpdateCheckThread() { } - - void SAL_CALL UpdateCheckThread::terminate() { @@ -387,7 +374,6 @@ UpdateCheckThread::terminate() } - void SAL_CALL UpdateCheckThread::join() { @@ -401,7 +387,6 @@ UpdateCheckThread::join() } - void UpdateCheckThread::cancel() { @@ -412,7 +397,6 @@ UpdateCheckThread::cancel() } - bool UpdateCheckThread::runCheck( bool & rbExtensionsChecked ) { @@ -451,7 +435,6 @@ UpdateCheckThread::runCheck( bool & rbExtensionsChecked ) } - void SAL_CALL UpdateCheckThread::onTerminated() { @@ -459,7 +442,6 @@ UpdateCheckThread::onTerminated() } - void SAL_CALL UpdateCheckThread::run() { @@ -565,7 +547,6 @@ UpdateCheckThread::run() } - void SAL_CALL ManualUpdateCheckThread::run() { @@ -582,14 +563,12 @@ ManualUpdateCheckThread::run() } - MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck) : m_aUpdateCheck(rUpdateCheck) { }; - uno::Any SAL_CALL MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& ) throw (lang::IllegalArgumentException, uno::Exception, std::exception) @@ -603,7 +582,6 @@ MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& ) } - DownloadThread::DownloadThread(osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext, const rtl::Reference< DownloadInteractionHandler >& rHandler, @@ -617,13 +595,11 @@ DownloadThread::DownloadThread(osl::Condition& rCondition, } - DownloadThread::~DownloadThread() { } - void SAL_CALL DownloadThread::run() { @@ -672,7 +648,6 @@ DownloadThread::run() } - void DownloadThread::cancel() { m_aDownload.stop(); @@ -683,7 +658,6 @@ void DownloadThread::cancel() } - void SAL_CALL DownloadThread::suspend() { osl::Thread::suspend(); @@ -691,7 +665,6 @@ void SAL_CALL DownloadThread::suspend() } - void SAL_CALL DownloadThread::onTerminated() { delete this; @@ -737,7 +710,6 @@ void SAL_CALL ShutdownThread::onTerminated() } - } // anonymous namespace UpdateCheck::UpdateCheck() @@ -850,7 +822,6 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues, } - void UpdateCheck::cancel() { @@ -868,7 +839,6 @@ UpdateCheck::cancel() } - void UpdateCheck::download() { @@ -897,7 +867,6 @@ UpdateCheck::download() } - void UpdateCheck::install() { @@ -941,7 +910,6 @@ UpdateCheck::install() } - void UpdateCheck::pause() { @@ -958,7 +926,6 @@ UpdateCheck::pause() } - void UpdateCheck::resume() { @@ -975,7 +942,6 @@ UpdateCheck::resume() } - void UpdateCheck::closeAfterFailure() { @@ -990,7 +956,6 @@ UpdateCheck::closeAfterFailure() } - void UpdateCheck::shutdownThread(bool join) { @@ -1014,7 +979,6 @@ UpdateCheck::shutdownThread(bool join) } - void UpdateCheck::enableAutoCheck(bool enable) { @@ -1025,7 +989,6 @@ UpdateCheck::enableAutoCheck(bool enable) } - void UpdateCheck::enableDownload(bool enable, bool paused) { @@ -1052,7 +1015,6 @@ UpdateCheck::enableDownload(bool enable, bool paused) } - bool UpdateCheck::downloadTargetExists(const OUString& rFileName) { @@ -1113,7 +1075,6 @@ bool UpdateCheck::checkDownloadDestination( const OUString& rFileName ) } - void UpdateCheck::downloadStalled(const OUString& rErrorMessage) { @@ -1126,7 +1087,6 @@ UpdateCheck::downloadStalled(const OUString& rErrorMessage) } - void UpdateCheck::downloadProgressAt(sal_Int8 nPercent) { @@ -1139,7 +1099,6 @@ UpdateCheck::downloadProgressAt(sal_Int8 nPercent) } - void UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize) { @@ -1158,7 +1117,6 @@ UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize } - void UpdateCheck::downloadFinished(const OUString& rLocalFileName) { @@ -1181,7 +1139,6 @@ UpdateCheck::downloadFinished(const OUString& rLocalFileName) } - void UpdateCheck::cancelDownload() { @@ -1208,7 +1165,6 @@ UpdateCheck::cancelDownload() } - void UpdateCheck::showDialog(bool forceCheck) { @@ -1270,7 +1226,6 @@ UpdateCheck::showDialog(bool forceCheck) } - void UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) { @@ -1351,7 +1306,6 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo) } - void UpdateCheck::setCheckFailedState() { @@ -1448,7 +1402,6 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble) } - UpdateState UpdateCheck::getUIState(const UpdateInfo& rInfo) { @@ -1466,7 +1419,6 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo) } - void UpdateCheck::showReleaseNote(const OUString& rURL) const { @@ -1480,7 +1432,6 @@ UpdateCheck::showReleaseNote(const OUString& rURL) const } - bool UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL) { @@ -1547,7 +1498,6 @@ void UpdateCheck::showExtensionDialog() } - rtl::Reference<UpdateHandler> UpdateCheck::getUpdateHandler() { @@ -1560,7 +1510,6 @@ UpdateCheck::getUpdateHandler() } - uno::Reference< task::XInteractionHandler > UpdateCheck::getInteractionHandler() const { @@ -1575,7 +1524,6 @@ UpdateCheck::getInteractionHandler() const } - bool UpdateCheck::isDialogShowing() const { @@ -1584,7 +1532,6 @@ UpdateCheck::isDialogShowing() const }; - void UpdateCheck::autoCheckStatusChanged(bool enabled) { @@ -1603,7 +1550,6 @@ UpdateCheck::autoCheckStatusChanged(bool enabled) }; - void UpdateCheck::autoCheckIntervalChanged() { diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index df8b4fcd386c..cc5d2f683edf 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -71,7 +71,6 @@ private: }; - /* This class implements the non published UNO service com.sun.star.setup.UpdateCheckConfig, * which primary use is to be able to track changes done in the Tools -> Options page of this * component, as this is not supported by the OOo configuration for extendable groups. @@ -202,8 +201,6 @@ private: }; - - template <typename T> T getValue( const css::uno::Sequence< css::beans::NamedValue >& rNamedValues, const sal_Char * pszName ) throw (css::uno::RuntimeException) diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index b2051c86ceba..ba41067d047a 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -109,8 +109,6 @@ private: }; - - InitUpdateCheckJobThread::InitUpdateCheckJobThread( const uno::Reference< uno::XComponentContext > &xContext, const uno::Sequence< beans::NamedValue > &xParameters, @@ -158,7 +156,6 @@ UpdateCheckJob::~UpdateCheckJob() } - uno::Sequence< OUString > UpdateCheckJob::getServiceNames() { @@ -167,7 +164,6 @@ UpdateCheckJob::getServiceNames() }; - OUString UpdateCheckJob::getImplName() { @@ -175,8 +171,6 @@ UpdateCheckJob::getImplName() } - - uno::Any UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues) throw (lang::IllegalArgumentException, uno::Exception, std::exception) @@ -259,7 +253,6 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa } - OUString SAL_CALL UpdateCheckJob::getImplementationName() throw (uno::RuntimeException, std::exception) { @@ -267,7 +260,6 @@ UpdateCheckJob::getImplementationName() throw (uno::RuntimeException, std::excep } - uno::Sequence< OUString > SAL_CALL UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { @@ -315,7 +307,6 @@ void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & ) } // anonymous namespace - static uno::Reference<uno::XInterface> SAL_CALL createJobInstance(const uno::Reference<uno::XComponentContext>& xContext) { @@ -327,7 +318,6 @@ createJobInstance(const uno::Reference<uno::XComponentContext>& xContext) } - static uno::Reference<uno::XInterface> SAL_CALL createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext) { @@ -335,7 +325,6 @@ createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext) } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -358,7 +347,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index d4e03b3bac74..40939ec6042c 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -504,8 +504,6 @@ void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& ) } - - void UpdateHandler::updateState( UpdateState eState ) { if ( meLastState == eState ) @@ -721,7 +719,6 @@ void UpdateHandler::loadStrings() } - void UpdateHandler::startThrobber( bool bStart ) { uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY ); diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index f2aaa4940f37..f68e5b1b8b9c 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -44,7 +44,6 @@ namespace task = css::task ; namespace xml = css::xml ; - static bool getBootstrapData( uno::Sequence< OUString > & rRepositoryList, @@ -74,7 +73,6 @@ getBootstrapData( } - // Returns 'true' if successfully connected to the update server bool checkForUpdates( diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx index e74ead2fc36a..070f930af160 100644 --- a/extensions/source/update/check/updateprotocoltest.cxx +++ b/extensions/source/update/check/updateprotocoltest.cxx @@ -32,7 +32,6 @@ namespace task = ::com::sun::star::task; namespace uno = ::com::sun::star::uno; - SAL_IMPLEMENT_MAIN() { (void) argv; diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx index c205732dc2fe..083c095d8b0c 100644 --- a/extensions/source/update/feed/test/updatefeedtest.cxx +++ b/extensions/source/update/feed/test/updatefeedtest.cxx @@ -38,7 +38,6 @@ namespace uno = ::com::sun::star::uno; namespace xml = ::com::sun::star::xml; - SAL_IMPLEMENT_MAIN() { (void) argv; diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 699cf8d2ebe6..60c9cc72a3f9 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -68,8 +68,6 @@ namespace xml = com::sun::star::xml ; namespace sdbc = com::sun::star::sdbc ; - - namespace { @@ -116,7 +114,6 @@ public: #endif - class ActiveDataSink : public ::cppu::WeakImplHelper< io::XActiveDataSink > { uno::Reference< io::XInputStream > m_xStream; @@ -131,7 +128,6 @@ public: }; - class UpdateInformationProvider : public ::cppu::WeakImplHelper< deployment::XUpdateInformationProvider, ucb::XWebDAVCommandEnvironment, @@ -225,7 +221,6 @@ private: }; - class UpdateInformationEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { public: @@ -292,7 +287,6 @@ private: }; - class SingleUpdateInformationEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { public: @@ -534,7 +528,6 @@ UpdateInformationProvider::load(const OUString& rURL) } - // TODO: docu content node uno::Reference< xml::dom::XElement > @@ -581,7 +574,6 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode } - uno::Reference< xml::dom::XNode > UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& rxNode, const OUString& rName) @@ -596,7 +588,6 @@ UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& } - uno::Reference< container::XEnumeration > SAL_CALL UpdateInformationProvider::getUpdateInformationEnumeration( uno::Sequence< OUString > const & repositories, @@ -667,7 +658,6 @@ UpdateInformationProvider::getUpdateInformationEnumeration( } - uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL UpdateInformationProvider::getUpdateInformation( uno::Sequence< OUString > const & repositories, @@ -712,7 +702,6 @@ UpdateInformationProvider::getUpdateInformation( } - void SAL_CALL UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception) { @@ -724,7 +713,6 @@ UpdateInformationProvider::cancel() throw (uno::RuntimeException, std::exception } - void SAL_CALL UpdateInformationProvider::setInteractionHandler( uno::Reference< task::XInteractionHandler > const & handler ) @@ -735,7 +723,6 @@ UpdateInformationProvider::setInteractionHandler( } - uno::Reference< task::XInteractionHandler > SAL_CALL UpdateInformationProvider::getInteractionHandler() throw ( uno::RuntimeException, std::exception ) @@ -776,7 +763,6 @@ UpdateInformationProvider::getServiceNames() }; - OUString UpdateInformationProvider::getImplName() { @@ -784,7 +770,6 @@ UpdateInformationProvider::getImplName() } - OUString SAL_CALL UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException, std::exception) { @@ -792,7 +777,6 @@ UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException, } - uno::Sequence< OUString > SAL_CALL UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { @@ -808,7 +792,6 @@ UpdateInformationProvider::supportsService( OUString const & serviceName ) throw } // anonymous namespace - static uno::Reference<uno::XInterface> SAL_CALL createInstance(uno::Reference<uno::XComponentContext> const & xContext) { @@ -816,7 +799,6 @@ createInstance(uno::Reference<uno::XComponentContext> const & xContext) } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -831,7 +813,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index a168e5e8acec..065f6f03a17b 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -66,7 +66,6 @@ using namespace ::com::sun::star; - static uno::Sequence< OUString > getServiceNames() { uno::Sequence< OUString > aServiceList { "com.sun.star.setup.UpdateCheckUI" }; @@ -74,14 +73,12 @@ static uno::Sequence< OUString > getServiceNames() } - static OUString getImplementationName() { return OUString("vnd.sun.UpdateCheckUI"); } - namespace { @@ -512,9 +509,6 @@ void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyNam } - - - BubbleWindow * UpdateCheckUI::GetBubbleWindow() { if ( !mpIconSysWin ) @@ -736,8 +730,6 @@ IMPL_LINK_TYPED( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, vo } - - #define TIP_HEIGHT 15 #define TIP_WIDTH 7 #define TIP_RIGHT_OFFSET 18 @@ -947,12 +939,9 @@ void BubbleWindow::RecalcTextRects() } - - } // anonymous namespace - static uno::Reference<uno::XInterface> SAL_CALL createInstance(const uno::Reference<uno::XComponentContext>& xContext) { @@ -960,7 +949,6 @@ createInstance(const uno::Reference<uno::XComponentContext>& xContext) } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -975,7 +963,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey) { return cppu::component_getFactoryHelper( diff --git a/extensions/test/ole/OleClient/axhost.cxx b/extensions/test/ole/OleClient/axhost.cxx index d79ff7b31a10..a163a6a7de4a 100644 --- a/extensions/test/ole/OleClient/axhost.cxx +++ b/extensions/test/ole/OleClient/axhost.cxx @@ -41,5 +41,4 @@ LRESULT HostWin::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, B } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 5759baa24428..d2700be2f1f3 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -189,7 +189,6 @@ bool doParameterTest(const Reference<XInvocation> & inv) Sequence<Any> seqMix2Out(arArgs1, 3); - //in args + out, optional, positional----------------------------------------- //first general test seqIndices.realloc(0); @@ -872,7 +871,6 @@ bool doSimpleTest(const Reference<XInvocation> & inv) return false; - // mixed parameter // mixed1 @@ -1104,11 +1102,6 @@ HRESULT doTest() } - - - - - // // in multi Sequences // // inMulDimArrayLong @@ -1188,14 +1181,9 @@ HRESULT doTest() inv->invoke( OUString(L"inMulDimArrayByte2"),Sequence< Any > ( &seqAny, 1), seqIndices, seqOut); - - - - // Tests with a MFC ActiveX control, ( pure dispinterface) - // in parameter MFC ActiveX // unsigned char is not supported by MFC @@ -1286,7 +1274,6 @@ HRESULT doTest() MessageBox( NULL, buff, _T("clientTest"), MB_OK); - // Sequence parameter MFC ActiveX // Sequences are not directly supported. @@ -1298,7 +1285,6 @@ HRESULT doTest() } - //VARIANT_TRUE VT_UI1 diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index d8401339c6c3..1c7538cb0752 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -60,8 +60,6 @@ void printResultVariantArray( VARIANT & var); void printVariant( VARIANT & var); - - int SAL_CALL _tmain( int argc, _TCHAR * argv[] ) { HRESULT hr; @@ -220,7 +218,6 @@ HRESULT doTest() DISPATCH_METHOD | DISPATCH_PROPERTYGET, ¶ms, &varRet, NULL, NULL); - CComVariant varByteArray; varByteArray.vt= VT_ARRAY | VT_I1; varByteArray.parray= (SAFEARRAY*)arByte; diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index fd210f42ec98..eed33b7ef443 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -60,7 +60,6 @@ using namespace com::sun::star::script; using namespace com::sun::star::reflection; - #define IMPL_NAME L"oletest.OleTestImpl" // oletest.OleTestImpl in applicat.rdb #define SERVICE_NAME L"oletest.OleTest" #define KEY1 L"/oletest.OleTestImpl/UNO/SERVICES" @@ -559,7 +558,6 @@ Sequence< Sequence<Reference<XEventListener > > > SAL_CALL OComponent::methodXEv } - Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte() throw( RuntimeException) { return m_seqByte; @@ -710,7 +708,6 @@ void SAL_CALL OComponent::setAttrXInterface( const Sequence< Reference< XInterfa } - ::sal_Int8 SAL_CALL OComponent::getAByte() throw (RuntimeException) { return m_attr_int8; @@ -1221,7 +1218,6 @@ void SAL_CALL OComponent::setAttrAny2(const Any& AttrAny2_) throw( RuntimeExcept } - // XTestStruct ======================================================================================= void SAL_CALL OComponent::methodStruct(const Property& aProp) throw( RuntimeException ) @@ -1894,8 +1890,6 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac break; - - } } diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx index 1d067bd04552..89764491cfaf 100644 --- a/extensions/test/ole/cppToUno/testcppuno.cxx +++ b/extensions/test/ole/cppToUno/testcppuno.cxx @@ -36,7 +36,6 @@ #include <rtl/string.h> - using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::script; @@ -72,8 +71,6 @@ int SAL_CALL _tmain( int /*argc*/, _TCHAR * /*argv[]*/ ) } - - HRESULT doTest() { HRESULT hr= S_OK; @@ -166,7 +163,6 @@ HRESULT doTest() } - } SafeArrayDestroy( par); } diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx index a7ee631e8a75..2e3ef0616019 100644 --- a/extensions/workben/pythonautotest.cxx +++ b/extensions/workben/pythonautotest.cxx @@ -38,9 +38,6 @@ using ::rtl::StringToOUString; #define USTRING_TO_PCHAR(x) OUStringToString(x , CHARSET_DONTKNOW ).GetCharStr() - - - /***** * * A Test root object ! @@ -271,7 +268,6 @@ protected: }; - void TestListener::cmdLine() { // Condition is set by running listener @@ -390,7 +386,6 @@ BOOL PythonCodeLibrary::queryInterface( Uik aUik, XInterfaceRef & rOut ) } - /* * main. */ diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx index e6b972931b30..b7174dbe12ab 100644 --- a/extensions/workben/pythontest.cxx +++ b/extensions/workben/pythontest.cxx @@ -39,7 +39,6 @@ using ::rtl::StringToOUString; #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM) - class NullEngineListenerRef : public XEngineListenerRef { virtual void interrupt(const InterruptEngineEvent& Evt) THROWS( (UsrSystemException) ) {} @@ -149,7 +148,6 @@ protected: }; - void CmdDebugger::cmdLine() { char pcLine[80]; @@ -454,10 +452,6 @@ BOOL CmdDebugger::queryInterface( Uik aUik, XInterfaceRef & rOut ) } - - - - /* * main. */ @@ -520,7 +514,6 @@ int SAL_CALL main (int argc, char **argv) xEngine->runAsync( UString( L"x=x+1\nprint 4\n") , XInterfaceRef(), args , XEngineListenerRef() ); - } else if( argc >1 && ! strcmp( argv[1] , "3" ) ) { diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 721d2b05990b..47eedfa23669 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -18,7 +18,6 @@ */ - // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. // Example : testcomponent com.sun.star.io.Pipe stm diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx index 5cfa08c2c2a5..593ea72897b1 100644 --- a/extensions/workben/testframecontrol.cxx +++ b/extensions/workben/testframecontrol.cxx @@ -185,7 +185,6 @@ void Listener_Impl::windowPaint( const PaintEvent& evt ) void Listener_Impl::disposing( const EventObject& evt ) {} - class FrameControlApplication : public Application { @@ -233,9 +232,6 @@ void FrameControlApplication::init() } - - - XInterfaceRef xInst = xMgr->createInstance( L"stardiv.one.frame.FrameControl" ); if (xInst->queryInterface( XControl::getSmartUik(), _xControl )) { @@ -276,7 +272,6 @@ void FrameControlApplication::deinit() } - void FrameControlApplication::Main() { // void TestErrcodes(); diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx index e31420824349..65be9b946b23 100644 --- a/extensions/workben/testresource.cxx +++ b/extensions/workben/testresource.cxx @@ -38,7 +38,6 @@ public: MyApp aMyApp; - void MyApp::Main() { XMultiServiceFactoryRef xSMgr = createRegistryServiceManager(); diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 37e50945b2d9..33fad886750e 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -60,13 +60,11 @@ BaseContainer::BaseContainer() } - BaseContainer::~BaseContainer() { } - void BaseContainer::init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , const OUString& sImplementationName, const css::uno::Sequence< OUString >& lServiceNames , @@ -83,7 +81,6 @@ void BaseContainer::init(const css::uno::Reference< css::uno::XComponentContext } - void BaseContainer::impl_loadOnDemand() { #ifdef LOAD_IMPLICIT @@ -120,7 +117,6 @@ void BaseContainer::impl_loadOnDemand() } - void BaseContainer::impl_initFlushMode() throw (css::uno::RuntimeException) { @@ -135,7 +131,6 @@ void BaseContainer::impl_initFlushMode() } - FilterCache* BaseContainer::impl_getWorkingCache() const { // SAFE -> @@ -148,7 +143,6 @@ FilterCache* BaseContainer::impl_getWorkingCache() const } - OUString SAL_CALL BaseContainer::getImplementationName() throw (css::uno::RuntimeException, std::exception) { @@ -156,7 +150,6 @@ OUString SAL_CALL BaseContainer::getImplementationName() } - sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) { @@ -170,7 +163,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames( } - void SAL_CALL BaseContainer::insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , @@ -211,7 +203,6 @@ void SAL_CALL BaseContainer::insertByName(const OUString& sItem , } - void SAL_CALL BaseContainer::removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , @@ -233,7 +224,6 @@ void SAL_CALL BaseContainer::removeByName(const OUString& sItem) } - void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , @@ -274,7 +264,6 @@ void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , } - css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , @@ -315,7 +304,6 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) } - css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() throw (css::uno::RuntimeException, std::exception) { @@ -344,7 +332,6 @@ css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() } - sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) throw (css::uno::RuntimeException, std::exception) { @@ -372,7 +359,6 @@ sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) } - css::uno::Type SAL_CALL BaseContainer::getElementType() throw (css::uno::RuntimeException, std::exception) { @@ -382,7 +368,6 @@ css::uno::Type SAL_CALL BaseContainer::getElementType() } - sal_Bool SAL_CALL BaseContainer::hasElements() throw (css::uno::RuntimeException, std::exception) { @@ -410,7 +395,6 @@ sal_Bool SAL_CALL BaseContainer::hasElements() } - css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) throw (css::uno::RuntimeException, std::exception) { @@ -421,7 +405,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea } - css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) throw (css::uno::RuntimeException, std::exception) { @@ -469,7 +452,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea } - void SAL_CALL BaseContainer::flush() throw (css::uno::RuntimeException, std::exception) { @@ -546,7 +528,6 @@ void SAL_CALL BaseContainer::flush() } - void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) throw (css::uno::RuntimeException, std::exception) { @@ -556,7 +537,6 @@ void SAL_CALL BaseContainer::addFlushListener(const css::uno::Reference< css::ut } - void SAL_CALL BaseContainer::removeFlushListener(const css::uno::Reference< css::util::XFlushListener >& xListener) throw (css::uno::RuntimeException, std::exception) { diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 79c7aff77b60..e0f351b14653 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -38,8 +38,6 @@ namespace filter{ namespace config{ - - /** @short implements the interface css::container::XNameContainer on top of a FilterCache reference. @@ -124,13 +122,11 @@ class BaseContainer : public BaseLock BaseContainer(); - /** @short standard dtor. */ virtual ~BaseContainer(); - /** @short initialize this generic intsnace with some specialized values from our derived object. @@ -166,14 +162,12 @@ class BaseContainer : public BaseLock protected: - /** @short check if the underlying configuration data was already loaded and do it if necessary automatically. */ void impl_loadOnDemand(); - /** @short it creates the global instance m_pFilterCache, which is a copy of the global instance m_rCache, and will be used to change the configuration. @@ -185,7 +179,6 @@ class BaseContainer : public BaseLock throw (css::uno::RuntimeException); - /** @short returns a pointer to the current used cache member. @descr Its a point to the FilterCache instance behind m_pFlushCache diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index ed235ca46b91..183b4d945191 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -39,7 +39,6 @@ CacheItem::CacheItem() } - void CacheItem::update(const CacheItem& rUpdateItem) { for(const_iterator pItUpdate = rUpdateItem.begin(); @@ -55,7 +54,6 @@ void CacheItem::update(const CacheItem& rUpdateItem) } - void CacheItem::validateUINames(const OUString& sActLocale) { if (sActLocale.isEmpty()) @@ -89,7 +87,6 @@ void CacheItem::validateUINames(const OUString& sActLocale) } - css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyValueList() { sal_Int32 c = (sal_Int32)size(); @@ -118,7 +115,6 @@ css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyVa } - bool isSubSet(const css::uno::Any& aSubSet, const css::uno::Any& aSet ) { @@ -326,7 +322,6 @@ bool isSubSet(const css::uno::Any& aSubSet, } - bool CacheItem::haveProps(const CacheItem& lProps) const { for (const_iterator pIt = lProps.begin(); @@ -357,7 +352,6 @@ bool CacheItem::haveProps(const CacheItem& lProps) const } - bool CacheItem::dontHaveProps(const CacheItem& lProps) const { for (const_iterator pIt = lProps.begin(); diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 6410be46c095..e890f3aaf92a 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -52,7 +52,6 @@ struct BaseLock typedef ::std::vector< OUString > OUStringList; - /** @short represent an item of a FilterCache instance. @@ -71,7 +70,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap CacheItem(); - /** @short update only properties, which are given by the specified rItem. @@ -86,7 +84,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap void update(const CacheItem& rUpdateItem); - /** @short check, if the given properties exist at this item. @@ -103,7 +100,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap bool haveProps(const CacheItem& lProps) const; - /** @short check, if the given properties don't exist at this item. @@ -120,7 +116,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap bool dontHaveProps(const CacheItem& lProps) const; - /** @short because we know two UIName properties (a list with all locales and the value for the current locale only), we must be sure @@ -134,7 +129,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap void validateUINames(const OUString& sActLocale); - /** @short convert this structure to a seq< PropertyValue > and ignore all empty properties! @@ -151,7 +145,6 @@ class CacheItem : public ::comphelper::SequenceAsHashMap }; - /** @short represent an item list of a FilterCache instance. */ @@ -161,7 +154,6 @@ typedef std::unordered_map< OUString , std::equal_to< OUString > > CacheItemList; - /** @short supports registration of multiple key to another string information. @@ -180,7 +172,6 @@ typedef std::unordered_map< OUString , std::equal_to< OUString > > CacheItemRegistration; - /** @short is used to collect all matching types of an URL during type detection. diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 9e222f58413c..4442a995b118 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -63,7 +63,6 @@ void CacheUpdateListener::startListening() } - void CacheUpdateListener::stopListening() { // SAFE -> @@ -80,7 +79,6 @@ void CacheUpdateListener::stopListening() } - void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEvent& aEvent) throw(css::uno::RuntimeException, std::exception) { @@ -180,7 +178,6 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven } - void SAL_CALL CacheUpdateListener::disposing(const css::lang::EventObject& aEvent) throw(css::uno::RuntimeException, std::exception) { diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 9a9704c52629..babc0aebd4a2 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config{ - - /** @short implements a listener, which will update the global filter cache, if the underlying configuration wa changed by other processes. @@ -83,19 +81,16 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante FilterCache::EItemType eConfigType); - /** @short standard dtor. */ virtual ~CacheUpdateListener(); - /** @short starts listening. */ void startListening(); - /** @short stop listening. */ void stopListening(); diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index 413561c3f9c6..094e1c081331 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -31,8 +31,6 @@ namespace filter{ namespace config{ - - /** @short supports registration of XRefreshListener on the global filter configuration. @@ -70,7 +68,6 @@ class ConfigFlush : public BaseLock explicit ConfigFlush(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - /** @short standard dtor. */ virtual ~ConfigFlush(); diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 38afa0689bcc..615f531bc190 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -43,13 +43,11 @@ ContentHandlerFactory::ContentHandlerFactory(const css::uno::Reference< css::uno } - ContentHandlerFactory::~ContentHandlerFactory() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -58,7 +56,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea } - css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , @@ -133,7 +130,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea } - css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) { @@ -142,14 +138,12 @@ css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServi } - OUString ContentHandlerFactory::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.ContentHandlerFactory" ); } - css::uno::Sequence< OUString > ContentHandlerFactory::impl_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.frame.ContentHandlerFactory" }; @@ -157,7 +151,6 @@ css::uno::Sequence< OUString > ContentHandlerFactory::impl_getSupportedServiceNa } - css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { ContentHandlerFactory* pNew = new ContentHandlerFactory( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index e9e949d4190d..89e9077062c3 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config{ - - /** @short implements the service <type scope="com.sun.star.document">ContentHandlerFactory</type>. */ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -56,7 +54,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine explicit ContentHandlerFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~ContentHandlerFactory(); @@ -87,7 +84,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -99,7 +95,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -111,7 +106,6 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 111ebcf4e50d..edd4b7544465 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -116,7 +116,6 @@ FilterCache::~FilterCache() } - FilterCache* FilterCache::clone() const { // SAFE -> ---------------------------------- @@ -149,7 +148,6 @@ FilterCache* FilterCache::clone() const } - void FilterCache::takeOver(const FilterCache& rClone) { // SAFE -> ---------------------------------- @@ -199,7 +197,6 @@ void FilterCache::takeOver(const FilterCache& rClone) } - void FilterCache::load(EFillState eRequired) throw(css::uno::Exception) { @@ -242,7 +239,6 @@ void FilterCache::load(EFillState eRequired) } - bool FilterCache::isFillState(FilterCache::EFillState eState) const throw(css::uno::Exception) { @@ -253,7 +249,6 @@ bool FilterCache::isFillState(FilterCache::EFillState eState) const } - OUStringList FilterCache::getMatchingItemsByProps( EItemType eType , const CacheItem& lIProps, const CacheItem& lEProps) const @@ -291,7 +286,6 @@ OUStringList FilterCache::getMatchingItemsByProps( EItemType eType , } - bool FilterCache::hasItems(EItemType eType) const throw(css::uno::Exception) { @@ -308,7 +302,6 @@ bool FilterCache::hasItems(EItemType eType) const } - OUStringList FilterCache::getItemNames(EItemType eType) const throw(css::uno::Exception) { @@ -332,7 +325,6 @@ OUStringList FilterCache::getItemNames(EItemType eType) const } - bool FilterCache::hasItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -366,7 +358,6 @@ bool FilterCache::hasItem( EItemType eType, } - CacheItem FilterCache::getItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -418,7 +409,6 @@ CacheItem FilterCache::getItem( EItemType eType, } - void FilterCache::removeItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -440,7 +430,6 @@ void FilterCache::removeItem( EItemType eType, } - void FilterCache::setItem( EItemType eType , const OUString& sItem , const CacheItem& aValue) @@ -480,7 +469,6 @@ void FilterCache::refreshItem( EItemType eType, } - void FilterCache::addStatePropsToItem( EItemType eType, const OUString& sItem, CacheItem& rItem) @@ -577,7 +565,6 @@ void FilterCache::addStatePropsToItem( EItemType eType, } - void FilterCache::removeStatePropsFromItem(CacheItem& rItem) throw(css::uno::Exception) { @@ -591,7 +578,6 @@ void FilterCache::removeStatePropsFromItem(CacheItem& rItem) } - void FilterCache::flush() throw(css::uno::Exception) { @@ -629,7 +615,6 @@ void FilterCache::flush() } - void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , const CacheItemList& rCache, @@ -691,7 +676,6 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN } - void FilterCache::detectFlatForURL(const css::util::URL& aURL , FlatDetection& rFlatTypes) const throw(css::uno::Exception) @@ -925,7 +909,6 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey) } - css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const OUString& sRoot , bool bReadOnly , bool bLocalesMode) @@ -985,7 +968,6 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess } - void FilterCache::impl_validateAndOptimize() throw(css::uno::Exception) { @@ -1419,7 +1401,6 @@ void FilterCache::impl_load(EFillState eRequiredState) } - void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameAccess >& xConfig, EItemType eType , EReadOption eOption, @@ -1530,7 +1511,6 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA } - void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode, CacheItem& rItem) throw(css::uno::Exception) @@ -1592,7 +1572,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe } - void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, const CacheItem& rItem) throw(css::uno::Exception) @@ -1731,7 +1710,6 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: } - CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -1806,7 +1784,6 @@ CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType } - void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xItem, EItemType eType, const CacheItem aItem) @@ -2062,7 +2039,6 @@ SfxFilterFlags FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequ } - void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) @@ -2093,7 +2069,6 @@ void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, } - void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) @@ -2242,7 +2217,6 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe } - OUStringList FilterCache::impl_tokenizeString(const OUString& sData , sal_Unicode cSeparator) { @@ -2280,7 +2254,6 @@ OUString FilterCache::impl_searchFrameLoaderForType(const OUString& sType) const } - OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) const { CacheItemList::const_iterator pIt; @@ -2301,7 +2274,6 @@ OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) co #endif - bool FilterCache::impl_isModuleInstalled(const OUString& sModule) { css::uno::Reference< css::container::XNameAccess > xCfg; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index c3db85aff2f4..b4315ed501f5 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -41,8 +41,6 @@ namespace filter{ class CacheUpdateListener; - - /** @short implements a cache, which contains all elements of our filter and type detection configuration. @@ -67,7 +65,6 @@ class FilterCache : public BaseLock public: - /** @short identify the type of a container item. @descr Because the cache interface is a generic one @@ -82,7 +79,6 @@ class FilterCache : public BaseLock }; - /** @short indicates, which items already exists inside this cache and which not. @@ -273,13 +269,11 @@ class FilterCache : public BaseLock FilterCache(); - /** @short standard dtor. */ virtual ~FilterCache(); - /** @short creates a copy of this container. @descr Such copy can be used then to modify items (add/change/remove) @@ -304,13 +298,11 @@ class FilterCache : public BaseLock FilterCache* clone() const; - /** @short copy the cache content or rClone back to this instance. */ void takeOver(const FilterCache& rClone); - /** @short force special fill state of this cache. @descr This method checks, if all requested items/properties already @@ -330,7 +322,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return the current fill state of this cache. @descr This information can be used e.g. to start @@ -346,7 +337,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return a list of key names for items, which match the specified criteria. @@ -384,7 +374,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short indicates if the requested sub container contains some items. @@ -410,7 +399,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return a list of all key names, which represent an item inside the specified sub container. @@ -435,7 +423,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short check if the required item exist inside this container. @attention This method exists to supports some UNO container interfaces @@ -460,7 +447,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short return an item, which match the specified type and name. @descr Because this cache can be used inside multithreaded environments @@ -490,7 +476,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO document me ... */ void removeItem( EItemType eType, @@ -498,7 +483,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO document me ... */ void setItem( EItemType eType , @@ -507,7 +491,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception, std::exception); - /** TODO document me ... */ void refreshItem( EItemType eType, @@ -515,7 +498,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short add some implicit properties to the given cache item reference. @@ -557,14 +539,12 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO document me */ static void removeStatePropsFromItem(CacheItem& aValue) throw(css::uno::Exception); - /** @short force writing of all changes (which was made after last flush was called) back to the configuration. @@ -578,7 +558,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short supports a flat type detection for given URL. @descr Because such detection works on our optimized internal @@ -615,7 +594,6 @@ class FilterCache : public BaseLock private: - /** @short return a reference to one of our internal sub container, which contains items of the requested type. @@ -634,7 +612,6 @@ class FilterCache : public BaseLock CacheItemList& impl_getItemList(EItemType eType); - /** @short return a valid configuration update access to the underlying configuration package, which is fix for this cache. @@ -656,7 +633,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short tries to open the requested configuration root using the specified modi. @@ -680,7 +656,6 @@ class FilterCache : public BaseLock bool bLocalesMode); - /** @short reads the specified configuration key and return its value. @@ -703,7 +678,6 @@ class FilterCache : public BaseLock css::uno::Any impl_getDirectCFGValue(const OUString& sDirectKey); - /** @short load the underlying configuration into this cache. @descr Which items should be readed can be regulate by the @@ -718,7 +692,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short validate the whole cache and create structures for optimized items access. @@ -741,7 +714,6 @@ class FilterCache : public BaseLock private: - /** @short read the specified config set into the cache. @descr This method provides the following mechanism for reading: @@ -774,7 +746,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short read the specified container item from the given configuration set. @descr Its not added to any internal structures here. That must be done @@ -804,7 +775,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** @short try to load the requested item on demand from the underlying configuration layer. @@ -835,7 +805,6 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ static void impl_saveItem(const css::uno::Reference< css::container::XNameReplace >& xSet , EItemType eType , @@ -843,15 +812,12 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ void impl_addItem2FlushList( EItemType eType, const OUString& sItem) throw(css::uno::Exception); - - /** TODO */ static void impl_flushByList(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , @@ -893,14 +859,12 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ void impl_readPatchUINames(const css::uno::Reference< css::container::XNameAccess >& xNode, CacheItem& rItem) throw(css::uno::Exception); - /** TODO */ static void impl_savePatchUINames(const css::uno::Reference< css::container::XNameReplace >& xNode, const CacheItem& rItem) @@ -916,27 +880,23 @@ class FilterCache : public BaseLock throw(css::uno::Exception); - /** TODO */ static void impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); - /** TODO */ static void impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); - /** TODO */ static OUStringList impl_tokenizeString(const OUString& sData , sal_Unicode cSeparator); - #if OSL_DEBUG_LEVEL > 0 /** TODO */ OUString impl_searchFrameLoaderForType(const OUString& sType) const; @@ -954,7 +914,6 @@ class FilterCache : public BaseLock bool impl_isModuleInstalled(const OUString& sModule); - /** @short convert a list of flag names to its int representation. @param lNames @@ -965,7 +924,6 @@ class FilterCache : public BaseLock static SfxFilterFlags impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames); - /** @short convert a flag field value to its list representation of flag names. @param nFlags diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 4577415798c0..9d3eed8a5d75 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -61,13 +61,11 @@ FilterFactory::FilterFactory(const css::uno::Reference< css::uno::XComponentCont } - FilterFactory::~FilterFactory() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -76,7 +74,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan } - css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , @@ -152,7 +149,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan } - css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) { @@ -180,7 +176,6 @@ css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames( } - css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException, std::exception) { @@ -236,7 +231,6 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea } - OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenizer& lTokens) const { // analyze query @@ -370,7 +364,6 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize } - class stlcomp_removeIfMatchFlags { private: @@ -412,7 +405,6 @@ class stlcomp_removeIfMatchFlags }; - OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lTokens) const { // analyze the given query parameter @@ -463,7 +455,6 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke } - OUStringList FilterFactory::impl_getListOfInstalledModules() const { // SAFE -> ---------------------- @@ -478,7 +469,6 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const } - OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const @@ -533,7 +523,6 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sM } - OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& sModule) const { // SAFE -> ---------------------- @@ -568,14 +557,12 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& } - OUString FilterFactory::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.FilterFactory" ); } - css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.document.FilterFactory" }; @@ -583,7 +570,6 @@ css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() } - css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { FilterFactory* pNew = new FilterFactory( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 8125bda72cac..0e9f7d8ef50f 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -31,8 +31,6 @@ namespace filter{ namespace config{ - - /** @short implements the service <type scope="com.sun.star.document">FilterFactory</type>. */ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -57,7 +55,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer explicit FilterFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~FilterFactory(); @@ -94,7 +91,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer private: - /** @short implement the container string query: "matchByDocumentService=:iflags=:eflags=:..." @param lTokens @@ -106,13 +102,11 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer OUStringList impl_queryMatchByDocumentService(const QueryTokenizer& lTokens) const; - /** TODO document me */ OUStringList impl_getListOfInstalledModules() const; - /** @short implement the container string query: "getSortedFilterList()[:module=<xxx>]:[iflags=<xxx>][:eflags=<xxx>]" @@ -125,7 +119,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer OUStringList impl_getSortedFilterList(const QueryTokenizer& lTokens) const; - /** TODO document me */ OUStringList impl_getSortedFilterListForModule(const OUString& sModule, @@ -133,7 +126,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer sal_Int32 nEFlags) const; - /** @short read a specialized and sorted list of filter names from the configuration (matching the specified module) @@ -151,7 +143,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -163,7 +154,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -175,7 +165,6 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index d2bcf6fd0d40..cae2e822c9b2 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -42,13 +42,11 @@ FrameLoaderFactory::FrameLoaderFactory(const css::uno::Reference< css::uno::XCom } - FrameLoaderFactory::~FrameLoaderFactory() { } - css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException, std::exception) @@ -57,7 +55,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI } - css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , @@ -130,7 +127,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI } - css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() throw(css::uno::RuntimeException, std::exception) { @@ -139,14 +135,12 @@ css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceN } - OUString FrameLoaderFactory::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.FrameLoaderFactory" ); } - css::uno::Sequence< OUString > FrameLoaderFactory::impl_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.frame.FrameLoaderFactory" }; @@ -154,7 +148,6 @@ css::uno::Sequence< OUString > FrameLoaderFactory::impl_getSupportedServiceNames } - css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { FrameLoaderFactory* pNew = new FrameLoaderFactory( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index c9c4cd30b0d5..eb7e506eb7d6 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config{ - - /** @short implements the service <type scope="com.sun.star.document">FrameLoaderFactory</type>. */ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -56,7 +54,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer explicit FrameLoaderFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~FrameLoaderFactory(); @@ -87,7 +84,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -99,7 +95,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -111,7 +106,6 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index 4dea850765a7..84ec1ba60bff 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -26,8 +26,6 @@ namespace filter{ namespace config{ - - QueryTokenizer::QueryTokenizer(const OUString& sQuery) : m_bValid(true) { @@ -63,14 +61,12 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery) } - QueryTokenizer::~QueryTokenizer() { /*TODO*/ } - bool QueryTokenizer::valid() const { return m_bValid; diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 6ddf8dd1b28d..9a25efa53915 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -81,13 +81,11 @@ class QueryTokenizer : public std::unordered_map< OUString , explicit QueryTokenizer(const OUString& sQuery); - /** @short destruct an instance of this class. */ virtual ~QueryTokenizer(); - /** @short can be used to check if analyzing of given query was successfully or not. */ diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 1e81e61c7a61..9bdcba90d1e7 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -58,13 +58,11 @@ TypeDetection::TypeDetection(const css::uno::Reference< css::uno::XComponentCont } - TypeDetection::~TypeDetection() { } - OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException, std::exception) { @@ -467,7 +465,6 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css:: } - void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDescriptor, OUString& sType ) { @@ -626,7 +623,6 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes } - bool TypeDetection::impl_getPreselectionForType( const OUString& sPreSelType, const util::URL& aParsedURL, FlatDetection& rFlatTypes, bool bDocService) { @@ -870,7 +866,6 @@ void TypeDetection::impl_getAllFormatTypes( } - OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , bool bAllowDeep , @@ -1068,7 +1063,6 @@ OUString TypeDetection::impl_askDetectService(const OUString& sDet } - OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor& rDescriptor) { css::uno::Reference< css::task::XInteractionHandler > xInteraction = @@ -1129,7 +1123,6 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript } - void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor) throw (css::uno::Exception) { @@ -1160,7 +1153,6 @@ void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor) } - void TypeDetection::impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor) { utl::MediaDescriptor::iterator pItType = rDescriptor.find(utl::MediaDescriptor::PROP_TYPENAME() ); @@ -1172,7 +1164,6 @@ void TypeDetection::impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rD } - bool TypeDetection::impl_validateAndSetTypeOnDescriptor( utl::MediaDescriptor& rDescriptor, const OUString& sType ) { @@ -1192,7 +1183,6 @@ bool TypeDetection::impl_validateAndSetTypeOnDescriptor( utl::MediaDescript } - bool TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDescriptor& rDescriptor, const OUString& sFilter ) { @@ -1222,14 +1212,12 @@ bool TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDescri } - OUString TypeDetection::impl_getImplementationName() { return OUString( "com.sun.star.comp.filter.config.TypeDetection" ); } - css::uno::Sequence< OUString > TypeDetection::impl_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames { "com.sun.star.document.TypeDetection" }; @@ -1237,7 +1225,6 @@ css::uno::Sequence< OUString > TypeDetection::impl_getSupportedServiceNames() } - css::uno::Reference< css::uno::XInterface > SAL_CALL TypeDetection::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { TypeDetection* pNew = new TypeDetection( comphelper::getComponentContext(xSMGR) ); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index def8863c5e36..af9f692a8ca1 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -30,8 +30,6 @@ namespace filter{ namespace config { - - /** @short implements the service <type scope="com.sun.star.document">TypeDetection</type>. */ class TypeDetection : public ::cppu::ImplInheritanceHelper< BaseContainer , @@ -56,7 +54,6 @@ public: explicit TypeDetection(const css::uno::Reference< css::uno::XComponentContext >& rxContext); - /** @short standard dtor. */ virtual ~TypeDetection(); @@ -82,7 +79,6 @@ private: FlatDetection& rFlatTypes); - /** @short make a combined flat/deep type detection @descr It steps over all flat detected types (given by the parameter lFlatTypes), @@ -134,7 +130,6 @@ private: OUString& rLastChance ); - /** @short seek a might existing stream to position 0. @descr This is an optinal action to be more robust @@ -148,7 +143,6 @@ private: static void impl_seekStreamToZero(utl::MediaDescriptor& rDescriptor); - /** @short make deep type detection for a specified detect service (threadsafe!). @@ -170,7 +164,6 @@ private: utl::MediaDescriptor& rDescriptor ); - /** @short try to find an interaction handler and ask him to select a possible filter for this unknown format. @@ -187,7 +180,6 @@ private: OUString impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor& rDescriptor); - /** @short check if an input stream is already part of the given MediaDesciptor and creates a new one if necessary. @@ -225,7 +217,6 @@ private: throw (css::uno::Exception); - /** @short validate the specified type and its relationships and set all needed information related to this type in the specified descriptor. @@ -248,7 +239,6 @@ private: const OUString& sType ); - /** @short validate the specified filter and its relationships and set all needed information related to this filter in the specified descriptor. @@ -270,7 +260,6 @@ private: const OUString& sFilter ); - /** @short remove anything related to a TYPE/FILTER entry from the specified MediaDescriptor. @@ -285,7 +274,6 @@ private: static void impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor& rDescriptor); - /** @short search the best suitable filter for the given type and add it into the media descriptor. @@ -340,7 +328,6 @@ public: public: - /** @short return the uno implementation name of this class. @descr Because this information is used at several places @@ -352,7 +339,6 @@ public: static OUString impl_getImplementationName(); - /** @short return the list of supported uno services of this class. @descr Because this information is used at several places @@ -364,7 +350,6 @@ public: static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); - /** @short return a new intsnace of this class. @descr This method is used by the uno service manager, to create diff --git a/filter/source/config/cache/versions.hxx b/filter/source/config/cache/versions.hxx index 2c0f9111283d..d6728330657a 100644 --- a/filter/source/config/cache/versions.hxx +++ b/filter/source/config/cache/versions.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX - #define _FILTER_CONFIG_MIGRATION_Q_ // useful for migration time, to support some old functionality temp. :-) #endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_VERSIONS_HXX diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 360da87fc92d..ed6bc501358d 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -60,7 +60,6 @@ using com::sun::star::frame::XModel; using com::sun::star::lang::XServiceInfo; - PageInfo::PageInfo() : mnBackgroundID( 0 ) , mnObjectsID( 0) @@ -69,7 +68,6 @@ PageInfo::PageInfo() } - PageInfo::~PageInfo() { vector<ShapeInfo*>::iterator aIter( maShapesVector.begin() ); @@ -112,7 +110,6 @@ FlashExporter::FlashExporter( } - FlashExporter::~FlashExporter() { Flush(); @@ -127,7 +124,6 @@ void FlashExporter::Flush() } - const sal_uInt16 cBackgroundDepth = 2; const sal_uInt16 cBackgroundObjectsDepth = 3; const sal_uInt16 cPageObjectsDepth = 4; @@ -398,7 +394,6 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, s } - sal_Int32 nPlaceDepth; // AS: A Slide can have a private background or use its masterpage's background. // We use the checksums on the metafiles to tell if backgrounds are the same and @@ -502,7 +497,6 @@ sal_uInt16 FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference< X } - /** export's the definition of the shapes inside this drawing page and adds the shape infos to the current PageInfo */ void FlashExporter::exportDrawPageContents( const Reference< XDrawPage >& xPage, bool bStream, bool bMaster ) @@ -512,7 +506,6 @@ void FlashExporter::exportDrawPageContents( const Reference< XDrawPage >& xPage, } - /** export's the definition of the shapes inside this XShapes container and adds the shape infos to the current PageInfo */ void FlashExporter::exportShapes( const Reference< XShapes >& xShapes, bool bStream, bool bMaster ) @@ -545,7 +538,6 @@ void FlashExporter::exportShapes( const Reference< XShapes >& xShapes, bool bStr } - /** export this shape definition and adds it's info to the current PageInfo */ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster ) { @@ -653,7 +645,6 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster } - bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground /* = false */, bool bExportAsJPEG /* = false */) { if( !mxGraphicExporter.is() ) diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index e4b831e5d58e..b369312759fd 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -112,7 +112,6 @@ struct PageInfo }; - class FlashExporter { public: diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 37b9a30c1a34..0976193e666b 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -136,7 +136,6 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (css::io::NotConnect } - class FlashExportFilter : public cppu::WeakImplHelper < css::document::XFilter, @@ -474,14 +473,12 @@ bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >& aDes } - void SAL_CALL FlashExportFilter::cancel( ) throw (RuntimeException, std::exception) { } - // XExporter void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) @@ -490,7 +487,6 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const css::uno::Reference< c } - // XInitialization void SAL_CALL FlashExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) throw (Exception, RuntimeException, std::exception) diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index fe1e67f29256..9a627dcf6782 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; - static MapMode aTWIPSMode( MAP_TWIP ); static MapMode a100thmmMode( MAP_100TH_MM ); @@ -40,7 +39,6 @@ static sal_Int32 map100thmm( sal_Int32 n100thMM ) } - Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nJPEGcompressMode ) : mpClipPolyPolygon( nullptr ), mpTag( nullptr ), @@ -96,7 +94,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int } - Writer::~Writer() { mpVDev.disposeAndClear(); @@ -105,7 +102,6 @@ Writer::~Writer() } - void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > &xOut ) { sal_uInt32 nBufferSize = 64*1024; @@ -136,7 +132,6 @@ void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > } - void Writer::storeTo( Reference< XOutputStream > &xOutStream ) { for(FontMap::iterator i = maFonts.begin(); i != maFonts.end(); ++i) @@ -181,7 +176,6 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream ) } - sal_uInt16 Writer::startSprite() { sal_uInt16 nShapeId = createID(); @@ -191,7 +185,6 @@ sal_uInt16 Writer::startSprite() } - void Writer::endSprite() { if( mpSprite ) @@ -213,7 +206,6 @@ void Writer::endSprite() } - void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClip, const char* pName ) { startTag( TAG_PLACEOBJECT2 ); @@ -249,7 +241,6 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int } - void Writer::removeShape( sal_uInt16 nDepth ) { startTag( TAG_REMOVEOBJECT2 ); @@ -258,7 +249,6 @@ void Writer::removeShape( sal_uInt16 nDepth ) } - void Writer::startTag( sal_uInt8 nTagId ) { DBG_ASSERT( mpTag == nullptr, "Last tag was not ended"); @@ -267,7 +257,6 @@ void Writer::startTag( sal_uInt8 nTagId ) } - void Writer::endTag() { sal_uInt8 nTag = mpTag->getTagId(); @@ -286,7 +275,6 @@ void Writer::endTag() } - void Writer::showFrame() { startTag( TAG_SHOWFRAME ); @@ -297,7 +285,6 @@ void Writer::showFrame() } - sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16 y ) { mpVDev->SetMapMode( rMtf.GetPrefMapMode() ); @@ -330,7 +317,6 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16 } - sal_uInt16 Writer::defineShape( const tools::Polygon& rPoly, const FillStyle& rFillStyle ) { const tools::PolyPolygon aPolyPoly( rPoly ); @@ -338,7 +324,6 @@ sal_uInt16 Writer::defineShape( const tools::Polygon& rPoly, const FillStyle& rF } - sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, const FillStyle& rFillStyle ) { sal_uInt16 nShapeId = createID(); @@ -382,7 +367,6 @@ sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, const FillS } - sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor ) { sal_uInt16 nShapeId = createID(); @@ -427,8 +411,6 @@ sal_uInt16 Writer::defineShape( const tools::PolyPolygon& rPolyPoly, sal_uInt16 } - - void Writer::stop() { startTag( TAG_DOACTION ); @@ -438,7 +420,6 @@ void Writer::stop() } - void Writer::waitOnClick( sal_uInt16 nDepth ) { placeShape( _uInt16( mnPageButtonId ), nDepth, 0, 0 ); @@ -448,7 +429,6 @@ void Writer::waitOnClick( sal_uInt16 nDepth ) } - /** inserts a doaction tag with an ActionGotoFrame */ void Writer::gotoFrame( sal_uInt16 nFrame ) { diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 333c2af911b6..198c04948e96 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -104,12 +104,10 @@ const sal_uInt8 TAG_FRAMELABEL = 43; const sal_uInt8 TAG_HEADER = 0xff; - /** converts a double to a 16.16 flash fixed value */ sal_uInt32 getFixed( double fValue ); - typedef ::std::map<BitmapChecksum, sal_uInt16> ChecksumCache; /** unsigned int 16 compare operation for stl */ @@ -122,7 +120,6 @@ struct ltuint16 }; - /** container class to create bit structures */ class BitStream { @@ -145,7 +142,6 @@ private: }; - /** this class collects all used glyphs for a given fonts and maps characters to glyph ids. */ @@ -174,7 +170,6 @@ private: typedef std::vector<FlashFont*> FontMap; - /** this class helps creating flash tags */ class Tag : public SvMemoryStream { @@ -205,7 +200,6 @@ private: }; - /** this class helps to define flash sprites */ class Sprite { @@ -223,7 +217,6 @@ private: }; - /** this class stores a flash fill style for shapes */ class FillStyle { @@ -253,7 +246,6 @@ private: }; - /** this class creates a flash movie from vcl geometry */ class Writer { @@ -424,7 +416,6 @@ private: }; - } #endif diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 28bae703090e..abec43edb973 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -50,7 +50,6 @@ static MapMode aTWIPSMode( MAP_TWIP ); static MapMode a100thmmMode( MAP_100TH_MM ); - Point Writer::map( const Point& rPoint ) const { const MapMode& aSourceMapMode = mpVDev->GetMapMode(); @@ -66,7 +65,6 @@ Point Writer::map( const Point& rPoint ) const } - Size Writer::map( const Size& rSize ) const { const MapMode& aSourceMapMode = mpVDev->GetMapMode(); @@ -82,7 +80,6 @@ Size Writer::map( const Size& rSize ) const } - void Writer::map( tools::PolyPolygon& rPolyPolygon ) const { const sal_uInt16 nPolyCount = rPolyPolygon.Count(); @@ -103,7 +100,6 @@ void Writer::map( tools::PolyPolygon& rPolyPolygon ) const } - sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const { MapMode aSourceMapMode( mpVDev->GetMapMode() ); @@ -114,7 +110,6 @@ sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const } - void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, bool bFilled ) { Point aLastPoint( rPoly[0] ); @@ -169,7 +164,6 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo } - /** Exports a style change record with a move to (x,y) and depending on bFilled a line style 1 or fill style 1 */ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int16 dy, bool bFilled ) @@ -192,7 +186,6 @@ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int1 } - /** Exports a straight edge record */ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int16 dy ) @@ -226,7 +219,6 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int } - /** Exports a curved edge record */ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, sal_Int16 control_dy, sal_Int16 anchor_dx, sal_Int16 anchor_dy ) @@ -249,7 +241,6 @@ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, s } - /** Exports a end shape record */ void Writer::Impl_addEndShapeRecord( BitStream& rBits ) @@ -258,7 +249,6 @@ void Writer::Impl_addEndShapeRecord( BitStream& rBits ) } - void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled ) { tools::PolyPolygon aPolyPoly( rPoly ); @@ -266,7 +256,6 @@ void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled ) } - void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ) { tools::PolyPolygon aPolyPoly( rPoly ); @@ -274,7 +263,6 @@ void Writer::Impl_writePolygon( const tools::Polygon& rPoly, bool bFilled, const } - void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, sal_uInt8 nTransparence /* = 0 */ ) { Color aLineColor( mpVDev->GetLineColor() ); @@ -287,7 +275,6 @@ void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bF } - void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bFilled, const Color& rFillColor, const Color& rLineColor ) { tools::PolyPolygon aPolyPoly( rPolyPoly ); @@ -322,7 +309,6 @@ void Writer::Impl_writePolyPolygon( const tools::PolyPolygon& rPolyPoly, bool bF } - /** A gradient is a transition from one color to another, rendered inside a given polypolygon */ void Writer::Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ) { @@ -357,14 +343,12 @@ void Writer::Impl_writeGradientEx( const tools::PolyPolygon& rPolyPoly, const Gr } - void Writer::setClipping( const tools::PolyPolygon* pClipPolyPolygon ) { mpClipPolyPolygon = pClipPolyPolygon; } - // AS: Just comparing fonts straight up is too literal. There are some // differences in font that actually require different glyphs to be defined, // and some that don't. This function is meant to capture all the differences @@ -380,7 +364,6 @@ bool compare_fonts_for_me(const vcl::Font& rFont1, const vcl::Font& rFont2) } - FlashFont& Writer::Impl_getFont( const vcl::Font& rFont ) { FontMap::iterator aIter( maFonts.begin() ); @@ -401,7 +384,6 @@ FlashFont& Writer::Impl_getFont( const vcl::Font& rFont ) } - void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth ) { const FontMetric aMetric( mpVDev->GetFontMetric() ); @@ -876,7 +858,6 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali } - void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& /* rSrcPt */, const Size& /* rSrcSz */, const Rectangle& rClipRect, bool bNeedToMapClipRect ) { if( !!rBmpEx ) @@ -989,7 +970,6 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h } - void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pAlphaCompressed, sal_uInt32 alpha_compressed_size ) { // AS: Go through the actual JPEG bits, separating out the @@ -1126,7 +1106,6 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal } - void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor ) { Color aOldColor( mpVDev->GetLineColor() ); @@ -1141,7 +1120,6 @@ void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* } - void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY ) { if( (rRect.Top() == rRect.Bottom()) || (rRect.Left() == rRect.Right()) ) @@ -1157,7 +1135,6 @@ void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY ) } - void Writer::Impl_writeEllipse( const Point& rCenter, long nRadX, long nRadY ) { tools::Polygon aPoly( rCenter, nRadX, nRadY ); @@ -1208,7 +1185,6 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke ) } - /** Writes the filling defined by SvtGraphicFill and returns true or it returns false if it can't handle this filling. */ @@ -1285,7 +1261,6 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling ) } - /* CL: The idea was to export page fields as text fields that get theire string from a variable set with actionscript by each page. This didn't work out since the formatting is always wrong when text follows the @@ -1334,7 +1309,6 @@ bool Writer::Impl_writePageField( Rectangle& rTextBounds ) #endif - void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon) { if(rLinePolygon.count()) @@ -1374,7 +1348,6 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf } - void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) { Rectangle clipRect; @@ -1842,9 +1815,6 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) } - - - void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint, const double P2x, const double P2y ) { @@ -1856,7 +1826,6 @@ void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint, } - void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint, const double P2x, const double P2y, const double P3x, const double P3y ) @@ -1872,7 +1841,6 @@ void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint, } - /* Approximate given cubic bezier curve by quadratic bezier segments */ void Writer::Impl_quadBezierApprox( BitStream& rBits, Point& rLastPoint, diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 4ab73991f79c..258463984c45 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -233,7 +233,6 @@ public: //========================== methods from PSWriter ========================== - PSWriter::PSWriter() : mbStatus(false) , mnLevelWarning(0) @@ -295,7 +294,6 @@ PSWriter::~PSWriter() } - bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem ) { sal_uInt32 nStreamPosition = 0, nPSPosition = 0; // -Wall warning, unset, check @@ -480,7 +478,6 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter } - void PSWriter::ImplWriteProlog( const Graphic* pPreview ) { ImplWriteLine( "%!PS-Adobe-3.0 EPSF-3.0 " ); @@ -616,7 +613,6 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) } - void PSWriter::ImplWriteEpilog() { ImplTranslate( 0, nBoundingY2 ); @@ -630,9 +626,6 @@ void PSWriter::ImplWriteEpilog() } - - - void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { tools::PolyPolygon aFillPath; @@ -1441,9 +1434,6 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) } - - - inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode ) { ImplWriteDouble( rPoint.X() ); @@ -1451,7 +1441,6 @@ inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode ) } - void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode ) { ImplWritePoint( rPoint ); @@ -1460,7 +1449,6 @@ void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode ) } - void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode ) { ImplWritePoint( rPoint ); @@ -1469,7 +1457,6 @@ void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode ) } - void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3, sal_uInt32 nMode ) { ImplWritePoint( rP1 ); @@ -1480,7 +1467,6 @@ void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3 } - void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMode ) { ImplWriteDouble( fX ); @@ -1490,7 +1476,6 @@ void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMo } - void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode ) { ImplWriteDouble( fX ); @@ -1500,7 +1485,6 @@ void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode ) } - void PSWriter::ImplRect( const Rectangle & rRect ) { if ( bFillColor ) @@ -1525,7 +1509,6 @@ void PSWriter::ImplRect( const Rectangle & rRect ) } - void PSWriter::ImplRectFill( const Rectangle & rRect ) { double nWidth = rRect.GetWidth(); @@ -1545,7 +1528,6 @@ void PSWriter::ImplRectFill( const Rectangle & rRect ) } - void PSWriter::ImplAddPath( const tools::Polygon & rPolygon ) { sal_uInt16 nPointCount = rPolygon.GetSize(); @@ -1570,7 +1552,6 @@ void PSWriter::ImplAddPath( const tools::Polygon & rPolygon ) } - void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) { sal_uInt16 i, nPolyCount = rPolyPoly.Count(); @@ -1588,7 +1569,6 @@ void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) } - void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ) { ScopedVclPtrInstance< VirtualDevice > l_pVDev; @@ -1599,7 +1579,6 @@ void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gra } - void PSWriter::ImplPolyPoly( const tools::PolyPolygon & rPolyPoly, bool bTextOutline ) { sal_uInt16 i, nPolyCount = rPolyPoly.Count(); @@ -1636,7 +1615,6 @@ void PSWriter::ImplPolyPoly( const tools::PolyPolygon & rPolyPoly, bool bTextOut } - void PSWriter::ImplPolyLine( const tools::Polygon & rPoly ) { if ( bLineColor ) @@ -1674,7 +1652,6 @@ void PSWriter::ImplPolyLine( const tools::Polygon & rPoly ) } - void PSWriter::ImplSetClipRegion( vcl::Region& rClipRegion ) { if ( !rClipRegion.IsEmpty() ) @@ -2068,7 +2045,6 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi } - void PSWriter::ImplWriteCharacter( sal_Char nChar ) { switch( nChar ) @@ -2082,7 +2058,6 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar ) } - void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const long* pDXArry, bool bStretch ) { sal_Int32 nLen = rString.getLength(); @@ -2114,7 +2089,6 @@ void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, co } - void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const long* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev ) { if ( rUniString.isEmpty() ) @@ -2175,7 +2149,6 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const lo } - void PSWriter::ImplSetAttrForText( const Point& rPoint ) { Point aPoint( rPoint ); @@ -2218,7 +2191,6 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) } - void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) { mpPS->WriteUChar( '/' ); //convert the font pOriginalName using ISOLatin1Encoding @@ -2242,9 +2214,6 @@ void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) } - - - void PSWriter::ImplClosePathDraw( sal_uLong nMode ) { mpPS->WriteCharPtr( "pc" ); @@ -2260,7 +2229,6 @@ void PSWriter::ImplPathDraw() } - inline void PSWriter::ImplWriteLineColor( sal_uLong nMode ) { if ( aColor != aLineColor ) @@ -2316,7 +2284,6 @@ void PSWriter::ImplGetMapMode( const MapMode& rMapMode ) } - inline void PSWriter::ImplExecMode( sal_uLong nMode ) { if ( nMode & PS_WRAP ) @@ -2341,7 +2308,6 @@ inline void PSWriter::ImplExecMode( sal_uLong nMode ) } - inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode ) { sal_uLong i = 0; @@ -2354,7 +2320,6 @@ inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode ) } - void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit, SvtGraphicStroke::CapType eLCap, SvtGraphicStroke::JoinType eJoin, @@ -2399,7 +2364,6 @@ void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit, } - void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) { SvtGraphicStroke::DashArray l_aDashArray; @@ -2449,7 +2413,6 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) } - void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) { const OString aNumber(OString::number(nNumber)); @@ -2459,7 +2422,6 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) } - void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) { sal_Int32 nPTemp = (sal_Int32)fNumber; @@ -2503,7 +2465,6 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) } - // writes the number to stream: nNumber / ( 10^nCount ) void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode ) @@ -2545,7 +2506,6 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode } - void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) { mpPS->WriteUChar( nNumb ); @@ -2554,7 +2514,6 @@ void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) } - void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode ) { if ( ( nNumb >> 4 ) > 9 ) @@ -2571,7 +2530,6 @@ void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode ) } - // writes the sal_uInt8 nNumb as a Number from 0.000 up to 1.000 void PSWriter::ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode ) @@ -2580,8 +2538,6 @@ void PSWriter::ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode ) } - - inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) { dwShift |= ( nCode << ( nOffset - nCodeLen ) ); @@ -2597,7 +2553,6 @@ inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) } - void PSWriter::StartCompression() { sal_uInt16 i; @@ -2623,7 +2578,6 @@ void PSWriter::StartCompression() } - void PSWriter::Compress( sal_uInt8 nCompThis ) { PSLZWCTreeNode* p; @@ -2677,7 +2631,6 @@ void PSWriter::Compress( sal_uInt8 nCompThis ) } - void PSWriter::EndCompression() { if( pPrefix ) @@ -2688,7 +2641,6 @@ void PSWriter::EndCompression() } - sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLong nComp, sal_uLong nSize ) { while ( nComp-- >= nSize ) @@ -2707,7 +2659,6 @@ sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDes } - bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize ) { bool bRetValue = false; diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 2e0048dde16d..3a8eba18408b 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; - CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XModel > & rModel ) : CGMOutAct ( rCGM ), nFinalTextCount ( 0 ) @@ -91,7 +90,6 @@ bool CGMImpressOutAct::ImplInitPage() } - bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) { uno::Reference< uno::XInterface > xNewShape( maXMultiServiceFactory->createInstance( rType ) ); @@ -106,7 +104,6 @@ bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) } - void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrientation ) { uno::Any aAny; @@ -119,7 +116,6 @@ void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrien } - void CGMImpressOutAct::ImplSetLineBundle() { uno::Any aAny; diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index 2243ed849f4f..89edee37e1bd 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -21,7 +21,6 @@ #include "main.hxx" - CGMBitmap::CGMBitmap( CGM& rCGM ) : mpCGM ( &rCGM ), pCGMBitmapDescriptor ( new CGMBitmapDescriptor ) @@ -30,14 +29,12 @@ CGMBitmap::CGMBitmap( CGM& rCGM ) : }; - CGMBitmap::~CGMBitmap() { delete pCGMBitmapDescriptor; } - void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) { rDesc.mbStatus = true; @@ -217,7 +214,6 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) } - void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc ) { sal_uInt16 nColors = sal::static_int_cast< sal_uInt16 >( @@ -230,7 +226,6 @@ void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc ) } - bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc ) { mpCGM->ImplGetPoint( rDesc.mnP ); // parallelogram p < - > r @@ -322,7 +317,6 @@ bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc ) } - void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest ) { if ( ( rSource.mnR.Y == rDest.mnQ.Y ) && ( rSource.mnR.X == rDest.mnQ.X ) ) diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index f59182d7a7f2..df877fed3020 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -31,15 +31,12 @@ Bundle& Bundle::operator=( Bundle& rSource ) }; - void Bundle::SetColor( sal_uInt32 nColor ) { mnColor = nColor; } - - LineBundle& LineBundle::operator=( LineBundle& rSource ) { SetIndex( rSource.GetIndex() ); @@ -111,7 +108,6 @@ CGMFList::~CGMFList() } - CGMFList& CGMFList::operator=( CGMFList& rSource ) { ImplDeleteList(); @@ -142,7 +138,6 @@ CGMFList& CGMFList::operator=( CGMFList& rSource ) } - FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex ) { sal_uInt32 nInd = nIndex; @@ -152,7 +147,6 @@ FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex ) } - static sal_Int8* ImplSearchEntry( sal_Int8* pSource, sal_Int8 const * pDest, sal_uInt32 nComp, sal_uInt32 nSize ) { while ( nComp-- >= nSize ) @@ -231,7 +225,6 @@ void CGMFList::InsertName( sal_uInt8* pSource, sal_uInt32 nSize ) } - void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_uInt32 nSize ) { FontEntry* pFontEntry; @@ -253,7 +246,6 @@ void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_ } - void CGMFList::ImplDeleteList() { for ( size_t i = 0, n = aFontEntryList.size(); i < n; ++i ) diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx index 0ad0202edff1..2e6573f59ee2 100644 --- a/filter/source/graphicfilter/icgm/bundles.hxx +++ b/filter/source/graphicfilter/icgm/bundles.hxx @@ -26,7 +26,6 @@ #include <vector> - class Bundle { @@ -51,7 +50,6 @@ public: }; - class LineBundle : public Bundle { public: @@ -69,7 +67,6 @@ public: }; - class MarkerBundle : public Bundle { public: @@ -88,7 +85,6 @@ public: }; - class EdgeBundle : public Bundle { public: @@ -105,7 +101,6 @@ public: }; - class TextBundle : public Bundle { public: @@ -128,7 +123,6 @@ public: }; - class FillBundle : public Bundle { public: @@ -147,8 +141,6 @@ public: }; - - class FontEntry { public: diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx index 12305f9c8bc6..929fe752a231 100644 --- a/filter/source/graphicfilter/icgm/class0.cxx +++ b/filter/source/graphicfilter/icgm/class0.cxx @@ -21,7 +21,6 @@ #include <outact.hxx> - void CGM::ImplDoClass0() { switch ( mnElementID ) diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx index b43238f5a140..641355924f74 100644 --- a/filter/source/graphicfilter/icgm/class1.cxx +++ b/filter/source/graphicfilter/icgm/class1.cxx @@ -21,7 +21,6 @@ #include <main.hxx> - void CGM::ImplDoClass1() { long nInteger, nI0, nI1; diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx index 6cd12931af49..93b3679381b6 100644 --- a/filter/source/graphicfilter/icgm/class2.cxx +++ b/filter/source/graphicfilter/icgm/class2.cxx @@ -21,7 +21,6 @@ #include <main.hxx> - void CGM::ImplDoClass2() { sal_uInt32 nUInteger; diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx index 3faf2572444d..c18a5866fae1 100644 --- a/filter/source/graphicfilter/icgm/class3.cxx +++ b/filter/source/graphicfilter/icgm/class3.cxx @@ -22,7 +22,6 @@ #include <outact.hxx> - void CGM::ImplDoClass3() { sal_uInt32 nUInteger; diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index fbd800c38779..442f10dc087d 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -41,7 +41,6 @@ double CGM::ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint ) } - void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ) { double nTemp; @@ -51,7 +50,6 @@ void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ) } - void CGM::ImplGetVector( double* pVector ) { if ( pElement->eVDCType == VDC_REAL ) diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx index 13ac9e42d619..1ff3cd7f05db 100644 --- a/filter/source/graphicfilter/icgm/class5.cxx +++ b/filter/source/graphicfilter/icgm/class5.cxx @@ -23,8 +23,6 @@ #include <outact.hxx> - - void CGM::ImplDoClass5() { switch ( mnElementID ) diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index b4f7994f15c2..bdbdb866caaf 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -23,7 +23,6 @@ #include <outact.hxx> - void CGM::ImplDoClass7() { switch ( mnElementID ) diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx index 28d565df1615..ce897128a2c2 100644 --- a/filter/source/graphicfilter/icgm/classx.cxx +++ b/filter/source/graphicfilter/icgm/classx.cxx @@ -22,7 +22,6 @@ #include <outact.hxx> - #define ImplSetUnderlineMode() \ \ sal_uInt32 nMode = ImplGetUI16(); \ @@ -37,7 +36,6 @@ pElement->nUnderlineColor = ImplGetBitmapColor(); - void CGM::ImplDoClass6() { switch ( mnElementID ) @@ -198,7 +196,6 @@ void CGM::ImplDoClass6() }; - void CGM::ImplDoClass8() { switch ( mnElementID ) @@ -217,7 +214,6 @@ void CGM::ImplDoClass8() }; - void CGM::ImplDoClass9() { switch ( mnElementID ) @@ -237,7 +233,6 @@ void CGM::ImplDoClass9() }; - void CGM::ImplDoClass15() { switch ( mnElementID ) @@ -250,5 +245,4 @@ void CGM::ImplDoClass15() }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index 2172b72bf14d..60e4c0f5f7b2 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -21,15 +21,12 @@ #include "elements.hxx" - - CGMElements::CGMElements() { Init(); }; - CGMElements::~CGMElements() { DeleteAllBundles( aLineList ); @@ -40,7 +37,6 @@ CGMElements::~CGMElements() } - CGMElements& CGMElements::operator=( CGMElements& rSource ) { sal_uInt32 nIndex; @@ -139,7 +135,6 @@ CGMElements& CGMElements::operator=( CGMElements& rSource ) } - void CGMElements::Init() { @@ -286,7 +281,6 @@ void CGMElements::Init() } - void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, long nAngle ) { HatchEntry& rEntry = maHatchMap[nKey]; @@ -296,7 +290,6 @@ void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, l } - void CGMElements::DeleteAllBundles( BundleList& rList ) { for ( size_t i = 0, n = rList.size(); i < n; ++i ) { @@ -306,8 +299,6 @@ void CGMElements::DeleteAllBundles( BundleList& rList ) }; - - void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest ) { DeleteAllBundles( rDest ); @@ -321,7 +312,6 @@ void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest ) }; - Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBundle ) { rBundle.SetIndex( nIndex ); @@ -332,7 +322,6 @@ Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBu } - Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex ) { for ( size_t i = 0, n = rList.size(); i < n; ++i ) { @@ -344,7 +333,6 @@ Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex ) } - Bundle* CGMElements::InsertBundle( BundleList& rList, Bundle& rBundle ) { Bundle* pBundle = GetBundle( rList, rBundle.GetIndex() ); diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index d8fbfdb83371..1d26363b40f1 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -888,5 +888,4 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.cxx b/filter/source/graphicfilter/idxf/dxfblkrd.cxx index d16428f3e850..07f67777ae3b 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.cxx @@ -22,11 +22,9 @@ #include <dxfblkrd.hxx> - //---------------- DXFBlock -------------------------------------------------- - DXFBlock::DXFBlock() : pSucc(nullptr) , nFlags(0) @@ -66,11 +64,9 @@ void DXFBlock::Read(DXFGroupReader & rDGR) } - //---------------- DXFBlocks ------------------------------------------------- - DXFBlocks::DXFBlocks() { pFirst=nullptr; @@ -127,5 +123,4 @@ void DXFBlocks::Clear() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.hxx b/filter/source/graphicfilter/idxf/dxfblkrd.hxx index 9f17599a5c44..572ce27575ca 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.hxx @@ -49,7 +49,6 @@ public: }; - //---------------- Eine Menge von Bloecken ----------------------------------- diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx index a2e6d7aabb48..93d78a3a161f 100644 --- a/filter/source/graphicfilter/idxf/dxfreprd.hxx +++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx @@ -24,7 +24,6 @@ #include <dxftblrd.hxx> - //--------------------Other stuff--------------------------------------------- @@ -66,7 +65,6 @@ private: }; - //-----------------read and represent DXF file-------------------------------- diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx b/filter/source/graphicfilter/idxf/dxftblrd.hxx index 569dc317300c..588e7c8f059d 100644 --- a/filter/source/graphicfilter/idxf/dxftblrd.hxx +++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx @@ -24,7 +24,6 @@ #include <dxfvec.hxx> - //------------------- Line Type ---------------------------------------------- @@ -48,7 +47,6 @@ public: }; - //------------------ Layer --------------------------------------------------- @@ -68,7 +66,6 @@ public: }; - //------------------ Style --------------------------------------------------- @@ -93,7 +90,6 @@ public: }; - //------------------ VPort --------------------------------------------------- @@ -141,7 +137,6 @@ public: }; - //------------------ Tabellen ------------------------------------------------ diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx index 94bf034729fb..f1e4fa19d37c 100644 --- a/filter/source/graphicfilter/idxf/dxfvec.hxx +++ b/filter/source/graphicfilter/idxf/dxfvec.hxx @@ -56,7 +56,6 @@ public: }; - //---------------------------- DXFVector --------------------------------------- // common 3D vector with doubles @@ -171,7 +170,6 @@ private: //------------------------------- inlines -------------------------------------- - inline DXFVector::DXFVector(double fX, double fY, double fZ) { fx=fX; fy=fY; fz=fZ; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index aec902e88888..9be5d83b5587 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -108,7 +108,6 @@ static long ImplGetNumber( sal_uInt8 **pBuf, sal_uInt32& nSecurityCount ) } - static int ImplGetLen( sal_uInt8* pBuf, int nMax ) { int nLen = 0; diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 44362384fb21..939e64af3466 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -452,7 +452,6 @@ bool PBMReader::ImplReadBody() break; - // PPM case 2 : diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 918669672eb1..1ee08fe7d9fc 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -168,7 +168,6 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem ) } - void PCDReader::CheckPCDImagePacFile() { char Buf[ 8 ]; @@ -181,7 +180,6 @@ void PCDReader::CheckPCDImagePacFile() } - void PCDReader::ReadOrientation() { if ( !bStatus ) @@ -192,7 +190,6 @@ void PCDReader::ReadOrientation() } - void PCDReader::ReadImage() { sal_uLong nx,ny,nW2,nH2,nYPair,ndy,nXPair; diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 9b959d206d01..386bb5deae9d 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -258,7 +258,6 @@ public: }; - #define SETBYTE \ switch ( nPixelSize ) \ { \ @@ -299,7 +298,6 @@ public: } - #define BITMAPERROR \ { \ if ( pAcc ) \ diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 3c71450c9c9c..f0993c3e7a23 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -169,7 +169,6 @@ bool PSDReader::ReadPSD(Graphic & rGraphic ) } - bool PSDReader::ImplReadHeader() { mpFileHeader = new PSDFileHeader; diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 14aba380c5cf..25da8fe7735f 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -87,7 +87,6 @@ RASReader::~RASReader() } - bool RASReader::ReadRAS(Graphic & rGraphic) { sal_uInt32 nMagicNumber; @@ -211,7 +210,6 @@ bool RASReader::ImplReadHeader() } - bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) { sal_Int32 x, y; diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 7cb2233104c6..eb82cbf49e51 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -130,7 +130,6 @@ TGAReader::~TGAReader() } - bool TGAReader::ReadTGA(Graphic & rGraphic) { if ( m_rTGA.GetError() ) @@ -170,7 +169,6 @@ bool TGAReader::ReadTGA(Graphic & rGraphic) } - bool TGAReader::ImplReadHeader() { mpFileHeader = new TGAFileHeader; @@ -271,7 +269,6 @@ bool TGAReader::ImplReadHeader() } - bool TGAReader::ImplReadBody() { @@ -706,7 +703,6 @@ bool TGAReader::ImplReadBody() } - bool TGAReader::ImplReadPalette() { if ( mbIndexing ) // read the colormap diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index df96e6eb1409..36a1d3e2c2f5 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -564,8 +564,6 @@ const CCIHuffmanTableEntry CCIUncompTableSave[CCIUncompTableSize]={ }; - - CCIDecompressor::CCIDecompressor( sal_uLong nOpts, sal_uInt32 nImageWidth ) : bTableBad ( false ), bStatus ( false ), @@ -1015,7 +1013,6 @@ void CCIDecompressor::Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTarget } - void CCIDecompressor::Read2DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTargetBits) { sal_uInt16 n2DMode,nBitPos,nUncomp,nRun,nRun2,nt; diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 10b1824ccde4..1e77120ab64b 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -537,7 +537,6 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen) } - bool TIFFReader::ReadMap() { if ( nCompression == 1 || nCompression == 32771 ) @@ -787,7 +786,6 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_u } - bool TIFFReader::ConvertScanline(sal_Int32 nY) { sal_uInt32 nRed, nGreen, nBlue, ns, nVal, nByteCount; @@ -1092,7 +1090,6 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY) } - void TIFFReader::MakePalCol() { if ( nDstBitsPerPixel <= 8 ) @@ -1143,7 +1140,6 @@ void TIFFReader::MakePalCol() } - void TIFFReader::ReadHeader() { sal_uInt8 nbyte1(0), nbyte2(0); @@ -1173,7 +1169,6 @@ bool TIFFReader::HasAlphaChannel() const } - bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) { sal_uInt16 i, nNumTags(0), nTagType(0); diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx index 508fd84e7a54..3cddf0b40976 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.cxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx @@ -223,5 +223,4 @@ void LZWDecompressor::DecompressSome() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index cd546e2b7226..f2b8b7abe2cc 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -23,7 +23,6 @@ #include <sal/macros.h> - namespace msfilter { // Mapping table ============================================================== @@ -31,7 +30,6 @@ namespace msfilter { namespace { - /** Table entry for Windows country ID <-> language type conversion. The first member is the Windows country ID, as defined in the header. @@ -58,7 +56,6 @@ struct CountryEntry }; - /** Table for Windows country ID <-> language type conversion. To map the same language to different country IDs, some of the entries diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 4a54dc144a53..5c4bd59bac33 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -142,7 +142,6 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty } - #define ADD_SHAPE( nType, nFlags ) \ { \ nShapeType = nType; \ diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index f4b50cae88fc..e7a089b0d4e0 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -89,8 +89,6 @@ public: }; - - // fractions of the Draw PPTWriter class EscherEx; @@ -189,7 +187,6 @@ public: }; - #endif // INCLUDED_FILTER_SOURCE_MSFILTER_ESCHESDO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 87dbf70af132..13680b30a729 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; namespace msfilter { - namespace { /** Rotates rnValue left by nBits bits. */ @@ -116,7 +115,6 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Size nBufferSize ) } // namespace - MSCodec_Xor95::MSCodec_Xor95(int nRotateDistance) : mnOffset( 0 ), mnKey( 0 ), @@ -248,7 +246,6 @@ void MSCodec_Xor95::Skip( sal_Size nBytes ) } - MSCodec_Std97::MSCodec_Std97 () { m_hCipher = rtl_cipher_create ( @@ -544,7 +541,6 @@ void MSCodec_Std97::GetDocId( sal_uInt8 pDocId[16] ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8492c7df2cd1..9a886d7996ed 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -377,7 +377,6 @@ DffPropertyReader::~DffPropertyReader() } - SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rRule ) { rIn.ReadUInt32( rRule.nRuleId ) @@ -780,7 +779,6 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) } - static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_LineEnd eLineEnd, const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLength, sal_Int32& rnArrowWidth, bool& rbArrowCenter, @@ -6147,7 +6145,6 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, } - /***************************************************************************** Access to a shape at runtime (via the Shape-Id) @@ -6189,7 +6186,6 @@ bool SvxMSDffManager::GetShape(sal_uLong nId, SdrObject*& rpShape, } - /* access to a BLIP at runtime (if the Blip-Number is already known) --------------------------- ******************************************************************************/ diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 240849ca63f7..02f2fd07a727 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -338,5 +338,4 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 278112b4ef9e..744fdc2591fa 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -506,7 +506,6 @@ bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequ } - uno::Sequence< OUString > VBAMacroResolver_getSupportedServiceNames() { uno::Sequence<OUString> aServiceNames { "com.sun.star.script.vba.VBAMacroResolver" }; @@ -524,7 +523,6 @@ uno::Reference< uno::XInterface > SAL_CALL VBAMacroResolver_createInstance( cons } - VBAMacroResolver::VBAMacroResolver() : mpObjShell( nullptr ) { diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 450097500bd2..ae6ef974e090 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3055,7 +3055,6 @@ HeaderFooterEntry::~HeaderFooterEntry() } - sal_uInt32 HeaderFooterEntry::IsToDisplay( sal_uInt32 nInstance ) { sal_uInt32 nMask = 0; @@ -4664,7 +4663,6 @@ PPTTextCharacterStyleAtomInterpreter::PPTTextCharacterStyleAtomInterpreter() } - PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter() { } diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 42b3b926afae..687411198c08 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -439,7 +439,6 @@ sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) } - // read parameters "1-3" or 1-3 with both values between 1 and nMax bool WW8ReadFieldParams::GetTokenSttFromTo(sal_Int32* pFrom, sal_Int32* pTo, sal_Int32 nMax) { diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 4c517cd3ead9..a42eb3c8b7c2 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -60,7 +60,6 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul } - #undef SERVICE_NAME @@ -73,13 +72,11 @@ PDFDialog::PDFDialog( const Reference< XComponentContext > &rxContext ) } - PDFDialog::~PDFDialog() { } - Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() throw(RuntimeException, std::exception) { @@ -87,7 +84,6 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() } - OUString SAL_CALL PDFDialog::getImplementationName() throw (RuntimeException, std::exception) { @@ -95,7 +91,6 @@ OUString SAL_CALL PDFDialog::getImplementationName() } - Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() throw (RuntimeException, std::exception) { @@ -103,7 +98,6 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() } - VclPtr<Dialog> PDFDialog::createDialog( vcl::Window* pParent ) { if( mxSrcDoc.is() ) @@ -112,7 +106,6 @@ VclPtr<Dialog> PDFDialog::createDialog( vcl::Window* pParent ) } - void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) { if( nExecutionResult && m_pDialog ) @@ -121,7 +114,6 @@ void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) } - Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() throw(RuntimeException, std::exception) { @@ -144,7 +136,6 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() } - Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() throw ( RuntimeException, std::exception ) { @@ -166,7 +157,6 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() } - void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { @@ -183,7 +173,6 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr } - void SAL_CALL PDFDialog::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception) { diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx index 637fb3937b99..0f0857036b2d 100644 --- a/filter/source/pdf/pdffilter.hxx +++ b/filter/source/pdf/pdffilter.hxx @@ -111,12 +111,4 @@ SAL_CALL PDFFilter_createInstance( const Reference< XMultiServiceFactory > & rSM #endif // INCLUDED_FILTER_SOURCE_PDF_PDFFILTER_HXX - - - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index de4d56244133..6deaec9bfb8f 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -55,14 +55,12 @@ using com::sun::star::presentation::XPresentationPage; using com::sun::star::task::XStatusIndicator; - PlaceWareExporter::PlaceWareExporter(const Reference< XComponentContext > & rxContext) : mxContext( rxContext ) { } - PlaceWareExporter::~PlaceWareExporter() { } @@ -400,7 +398,6 @@ bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOut } - PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage ) { Reference< XComponent > xComp( xDrawPage, UNO_QUERY ); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 2c257f1b53e3..abcf09bb0e22 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -40,7 +40,6 @@ using ::com::sun::star::task::XStatusIndicator; namespace pwp { - class PlaceWareExportFilter : public cppu::WeakImplHelper < css::document::XFilter, @@ -72,14 +71,12 @@ public: }; - PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext > &rxContext) : mxContext( rxContext ) { } - sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (RuntimeException, std::exception) { @@ -119,14 +116,12 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css:: } - void SAL_CALL PlaceWareExportFilter::cancel( ) throw (RuntimeException, std::exception) { } - // XExporter void SAL_CALL PlaceWareExportFilter::setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw (css::lang::IllegalArgumentException, RuntimeException, std::exception) @@ -135,7 +130,6 @@ void SAL_CALL PlaceWareExportFilter::setSourceDocument( const css::uno::Referenc } - // XInitialization void SAL_CALL PlaceWareExportFilter::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) throw (Exception, RuntimeException, std::exception) @@ -181,7 +175,6 @@ css::uno::Sequence< OUString > SAL_CALL PlaceWareExportFilter::getSupportedServi } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index 040359ce8b00..01e9d97acc8e 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -377,7 +377,6 @@ bool parseOpacity (const char* sOpacity, ARGBColor& rColor ) } - bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform ) { using namespace ::boost::spirit::classic; @@ -493,7 +492,6 @@ bool parseTransform( const char* sTransform, basegfx::B2DHomMatrix& rTransform ) } - bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect ) { using namespace ::boost::spirit::classic; @@ -521,7 +519,6 @@ bool parseViewBox( const char* sViewbox, basegfx::B2DRange& rRect ) } - bool parseDashArray( const char* sDashArray, std::vector<double>& rOutputVector ) { using namespace ::boost::spirit::classic; @@ -545,7 +542,6 @@ bool parseDashArray( const char* sDashArray, std::vector<double>& rOutputVector } - bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri, std::pair<ARGBColor,bool>& io_rColor, const char* sPaintUri ) @@ -571,7 +567,6 @@ bool parsePaintUri( std::pair<const char*,const char*>& o_rPaintUri, } - bool parseXlinkHref( const char* sXlinkHref, OUString& data ) { OUString sLink(OUString::createFromAscii(sXlinkHref)); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index b83fe226e1bb..44940cc4f53c 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1997,7 +1997,6 @@ bool SVGFilter::implCreateObjects() } - bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes ) { Reference< XShape > xShape; diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 6ec9d09a844a..1510293d713d 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -2131,7 +2131,6 @@ bool SVGReader::parseAndConvert() m_xDocumentHandler->endElement( "office:master-styles" ); - xAttrs->Clear(); m_xDocumentHandler->startElement( "office:body", xUnoAttrs ); m_xDocumentHandler->startElement( "office:drawing", xUnoAttrs ); diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx index 447939864823..988cc46aa5fc 100644 --- a/filter/source/svg/test/parsertest.cxx +++ b/filter/source/svg/test/parsertest.cxx @@ -195,7 +195,6 @@ public: }; - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestParser, "test svg parser fragments"); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index d0d9d93a1cff..9fd20d7b7ce9 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -65,7 +65,6 @@ css::uno::Reference < css::uno::XInterface > SAL_CALL throw ( css::uno::Exception ); - // class T602ImportFilter diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index 8d5b402e63e7..65f6d654c066 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -31,7 +31,6 @@ #include <cppuhelper/implbase.hxx> - enum FilterType { FILTER_IMPORT, @@ -68,7 +67,6 @@ protected: throw (css::uno::RuntimeException, std::exception); - public: explicit XmlFilterAdaptor( const css::uno::Reference< css::uno::XComponentContext > & rxContext) @@ -80,7 +78,6 @@ public: virtual ~XmlFilterAdaptor() {} - // XFilter virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) @@ -90,14 +87,12 @@ public: throw (css::uno::RuntimeException, std::exception) override; - // XExporter virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - // XImporter virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) @@ -105,7 +100,6 @@ public: throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) @@ -113,7 +107,6 @@ public: throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) @@ -131,22 +124,18 @@ public: }; - OUString XmlFilterAdaptor_getImplementationName() throw ( css::uno::RuntimeException ); - bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName ) throw ( css::uno::RuntimeException ); - css::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) throw ( css::uno::RuntimeException ); - css::uno::Reference< css::uno::XInterface > SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) @@ -154,7 +143,6 @@ SAL_CALL XmlFilterAdaptor_createInstance( const css::uno::Reference< css::lang:: throw ( css::uno::Exception ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index e6e01c7bc7d4..7a73ba8fc511 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -29,7 +29,6 @@ #include <vector> - extern OUString string_encode( const OUString & rText ); extern OUString string_decode( const OUString & rText ); @@ -37,7 +36,6 @@ bool copyStreams( css::uno::Reference< css::io::XInputStream > xIS, css::uno::Re bool createDirectory( OUString& rURL ); - class filter_info_impl { public: @@ -71,7 +69,6 @@ public: }; - struct application_info_impl { OUString maDocumentService; @@ -83,7 +80,6 @@ struct application_info_impl }; - extern std::vector< application_info_impl* >& getApplicationInfos(); extern OUString getApplicationUIName( const OUString& rServiceName ); extern const application_info_impl* getApplicationInfo( const OUString& rServiceName ); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index d1dab361f242..abf579ef3b2f 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -111,7 +111,6 @@ private: }; - namespace { static ResMgr* pXSLTResMgr = nullptr; @@ -133,13 +132,11 @@ XMLFilterDialogComponent::XMLFilterDialogComponent( const css::uno::Reference< X } - XMLFilterDialogComponent::~XMLFilterDialogComponent() { } - // XInterface Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { @@ -147,7 +144,6 @@ Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw } - Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) { if (rType == cppu::UnoType<css::ui::dialogs::XExecutableDialog>::get()) @@ -174,21 +170,18 @@ Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) th } - void SAL_CALL XMLFilterDialogComponent::acquire() throw () { OComponentHelper::acquire(); } - void SAL_CALL XMLFilterDialogComponent::release() throw () { OComponentHelper::release(); } - OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException ) { return OUString( "com.sun.star.comp.ui.XSLTFilterDialog" ); @@ -218,7 +211,6 @@ Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId() th } - namespace { class DialogComponentTypes @@ -275,7 +267,6 @@ void SAL_CALL XMLFilterDialogComponent::disposing() } - // XTerminateListener void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException, std::exception) { @@ -297,7 +288,6 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* } - void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ ) throw (RuntimeException, std::exception) { // we are going down, so dispose us! diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 813accbee57c..f5a44eb616b5 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -235,9 +235,6 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt } - - - void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ) { try diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 4d3e83573083..60e084799d8e 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1578,7 +1578,6 @@ bool filter_info_impl::operator==( const filter_info_impl& r ) const } - Sequence< OUString > filter_info_impl::getFilterUserData() const { Sequence< OUString > aUserData(8); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 5d700704444b..02b01823754d 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -81,7 +81,6 @@ public: }; - class XMLFilterSettingsDialog : public ModelessDialog { public: diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 9f9c3e785e5a..ae4610619bf7 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -72,7 +72,6 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, } - XMLFilterTabDialog::~XMLFilterTabDialog() { disposeOnce(); @@ -89,7 +88,6 @@ void XMLFilterTabDialog::dispose() } - bool XMLFilterTabDialog::onOk() { mpXSLTPage->FillInfo( mpNewInfo ); @@ -280,10 +278,6 @@ bool XMLFilterTabDialog::onOk() } - - - - IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*, void) { if( onOk() ) @@ -291,7 +285,6 @@ IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*, void) } - IMPL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); @@ -300,5 +293,4 @@ IMPL_STATIC_LINK_TYPED( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabC } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 3aac59642e8b..613ada3b798f 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -294,7 +294,6 @@ void XMLFilterTestDialog::initDialog() m_pFTExportXSLTFile->SetText( getFileNameFromURL( m_pFilterInfo->maExportXSLT ) ); - m_pImport->Enable(bImport); m_pFTImportTemplate->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty()); m_pFTImportTemplateFile->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty()); diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 0c29016817ef..d79cd01713a1 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -222,7 +222,6 @@ namespace XSLT } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 2029b9f9e138..9d5343ab024d 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -533,7 +533,6 @@ namespace XSLT } - // Component management #define FILTER_SERVICE_NAME "com.sun.star.documentconversion.XSLTFilter" diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index eb636fbf8367..bc95252fd415 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -118,7 +118,6 @@ Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (Runtime } - OComboBoxModel::OComboBoxModel(const Reference<XComponentContext>& _rxFactory) :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_COMBOBOX, FRM_SUN_CONTROL_COMBOBOX, true, true, true ) // use the old control name for compatibility reasons diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 1886ec8e39af..57f05f3f3503 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -63,7 +63,6 @@ class OComboBoxModel ::std::unique_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; - protected: virtual css::uno::Sequence< css::uno::Type> _getTypes() override; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index ce765536bd28..8c587e75c9b3 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -116,7 +116,6 @@ void OCurrencyModel::implConstruct() } - OCurrencyModel::OCurrencyModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_CURRENCYFIELD, FRM_SUN_CONTROL_CURRENCYFIELD, false, true ) // use the old control name for compaytibility reasons diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 4694567ffe14..3c946a2e968d 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -86,7 +86,6 @@ namespace frm { - //= html tools diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 2ed97bc19f24..42e9f38ae2f1 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -271,7 +271,6 @@ Sequence<Type> OEditModel::_getTypes() } - OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, true, true ) ,m_bMaxTextLenModified(false) diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index abb292f4b7ac..894361dd0d1f 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -79,7 +79,6 @@ css::uno::Sequence<OUString> OFileControlModel::getSupportedServiceNames() thro } - OFileControlModel::OFileControlModel(const Reference<XComponentContext>& _rxFactory) :OControlModel(_rxFactory, VCL_CONTROLMODEL_FILECONTROL) ,m_aResetListeners(m_aMutex) diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index de256f361cb7..a6e9bba78946 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -44,7 +44,6 @@ namespace frm { - // OFilterControl typedef ::cppu::ImplHelper5 < css::awt::XTextComponent diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 168d524c5aad..b4335b1f2bb5 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -206,7 +206,6 @@ protected: } // namespace frm - #endif // INCLUDED_FORMS_SOURCE_COMPONENT_GRID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index d7abf144c760..5262ea3250a1 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -200,7 +200,6 @@ public: }; - } // namespace frm diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 4185e575a0ff..896eafdc6633 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -36,7 +36,6 @@ namespace frm { - // OImageControlModel typedef ::cppu::ImplHelper2 < css::form::XImageProducerSupplier diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 66e5ba281ca3..3ab288f4b610 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -68,7 +68,6 @@ Sequence<Type> ONumericModel::_getTypes() } - ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_NUMERICFIELD, FRM_SUN_CONTROL_NUMERICFIELD, true, true ) // use the old control name for compytibility reasons diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 1fbb7d0dbe4f..9f01b4217343 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -71,7 +71,6 @@ Sequence<Type> OPatternModel::_getTypes() } - OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_PATTERNFIELD, FRM_SUN_CONTROL_PATTERNFIELD, false, false ) // use the old control name for compytibility reasons @@ -111,7 +110,6 @@ css::uno::Sequence<OUString> SAL_CALL OPatternModel::getSupportedServiceNames() } - void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel ) diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 6dbdd939842f..182dd898e024 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -55,7 +55,6 @@ css::uno::Sequence<OUString> SAL_CALL ORadioButtonControl::getSupportedServiceNa } - ORadioButtonControl::ORadioButtonControl(const Reference<XComponentContext>& _rxFactory) :OBoundControl(_rxFactory, VCL_CONTROL_RADIOBUTTON) { diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index f0a2d7b112db..d4123042fb00 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -103,7 +103,6 @@ Sequence<Type> OTimeModel::_getTypes() } - OTimeModel::OTimeModel(const Reference<XComponentContext>& _rxFactory) : OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_TIMEFIELD, FRM_SUN_CONTROL_TIMEFIELD, true, true) diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 1d4618846f4e..834bdd3e1595 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -346,7 +346,6 @@ namespace frm } - void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException, std::exception) { m_aSubmissionVetoListeners.addInterface( listener ); @@ -449,7 +448,6 @@ namespace frm } - OClickableImageBaseModel::OClickableImageBaseModel( const Reference< XComponentContext >& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& rDefault ) :OControlModel( _rxFactory, _rUnoControlModelTypeName, rDefault ) diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index 789dc0f5f095..b8acb0793ead 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -75,7 +75,6 @@ namespace frm } - void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent ) throw (RuntimeException, std::exception) { ControlModelLock aLock( m_rControlModel ); diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 1e3b14699030..5905314eef42 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -180,7 +180,6 @@ namespace frm } // namespace frm - #endif // INCLUDED_FORMS_SOURCE_COMPONENT_ENTRYLISTHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx index ba3a6333a040..0af5c919ee86 100644 --- a/forms/source/helper/commanddescriptionprovider.cxx +++ b/forms/source/helper/commanddescriptionprovider.cxx @@ -75,7 +75,6 @@ namespace frm }; - void DefaultCommandDescriptionProvider::impl_init_nothrow( const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument ) { OSL_ENSURE( _rxDocument.is(), "DefaultCommandDescriptionProvider::impl_init_nothrow: no document => no command descriptions!" ); diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index e274ec5e3ea5..dc93200b04cc 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -57,8 +57,6 @@ namespace frm { - - struct ElementDescription { public: diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx index a43a41f80419..cff411e3dcc0 100644 --- a/forms/source/inc/commanddescriptionprovider.hxx +++ b/forms/source/inc/commanddescriptionprovider.hxx @@ -30,7 +30,6 @@ namespace frm { - //= ICommandDescriptionProvider class SAL_NO_VTABLE ICommandDescriptionProvider diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index 7b6f01bf8d80..560be1dc5c74 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -32,7 +32,6 @@ namespace frm { - //= ICommandImageProvider typedef ::std::vector< Image > CommandImages; diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index f79b0bfb6f99..cae6afd7a66e 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -32,7 +32,6 @@ #include <memory> - namespace frm { diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 87f87c87e1f5..7415ebee90ea 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -29,7 +29,6 @@ namespace frm { - //- properties #define PROPERTY_TABINDEX "TabIndex" @@ -298,7 +297,6 @@ namespace frm } // namespace frm - #endif // INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/inc/limitedformats.hxx b/forms/source/inc/limitedformats.hxx index 1d8cc6ba37ee..e1c922a15293 100644 --- a/forms/source/inc/limitedformats.hxx +++ b/forms/source/inc/limitedformats.hxx @@ -30,7 +30,6 @@ namespace frm { - //= OLimitedFormats /** maintains translation tables format key <-> enum value diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 23829961ca7d..c6ab5639c73c 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -132,7 +132,6 @@ public: _rAggregateProps = aggregate->getPropertySetInfo()->getProperties(); \ - #define DECL_PROP0(varname, type) \ DECL_PROP_IMPL(varname, type) 0) @@ -180,12 +179,10 @@ public: DECL_BOOL_PROP_IMPL(varname) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3 ) - #define END_DESCRIBE_PROPERTIES() \ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \ - #define REGISTER_PROP_2( prop, member, attrib1, attrib2 ) \ registerProperty( PROPERTY_##prop, PROPERTY_ID_##prop, PropertyAttribute::attrib1 | PropertyAttribute::attrib2, \ &member, cppu::UnoType<decltype(member)>::get() ); diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx index 9fe7c6b4aec4..a309085241c2 100644 --- a/forms/source/inc/propertybaghelper.hxx +++ b/forms/source/inc/propertybaghelper.hxx @@ -32,7 +32,6 @@ namespace frm { - //= class IPropertyBagHelperContext class SAL_NO_VTABLE IPropertyBagHelperContext diff --git a/forms/source/inc/windowstateguard.hxx b/forms/source/inc/windowstateguard.hxx index 828a5ae6a51f..6d1f94554093 100644 --- a/forms/source/inc/windowstateguard.hxx +++ b/forms/source/inc/windowstateguard.hxx @@ -29,7 +29,6 @@ namespace frm { - //= WindowStateGuard class WindowStateGuard_Impl; diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 35293e59319b..c502ccc9e19d 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -365,5 +365,4 @@ namespace frm } // namespace frm - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 4602445491b5..39c5fc4cbe13 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -41,7 +41,6 @@ namespace frm { - //= FormOperations typedef ::cppu::WeakComponentImplHelper < css::form::runtime::XFormOperations diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 6f0226c93c80..8b767e439362 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -45,7 +45,6 @@ namespace frm namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; - namespace { static bool isArtificialItem( sal_Int16 _nFeatureId ) @@ -707,7 +706,6 @@ namespace frm } - } // namespace frm diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index f8879b02c3c0..f30942a26df8 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -104,7 +104,6 @@ public: } - // methods for XNameAccess (inherits XElementAccess) @@ -135,7 +134,6 @@ public: } - // methods for XNameReplace (inherits XNameAccess) @@ -158,7 +156,6 @@ public: } - // methods for XNameContainer (inherits XNameReplace) diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 9c7f4484674f..b4736d705b55 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -99,8 +99,6 @@ using com::sun::star::xml::dom::events::XEventTarget; using com::sun::star::xsd::XDataType; - - #define EXCEPT(msg) OUString(msg),static_cast<XValueBinding*>(this) #define HANDLE_BindingID 0 @@ -295,7 +293,6 @@ OUString Binding::explainInvalid() } - EvaluationContext Binding::getEvaluationContext() const { OSL_ENSURE( getModelImpl() != nullptr, "need model impl" ); @@ -329,9 +326,6 @@ Binding* SAL_CALL Binding::getBinding( const Reference<XPropertySet>& xPropertyS } - - - void Binding::setBindingID( const OUString& sBindingID ) { msBindingID = sBindingID; @@ -1009,9 +1003,6 @@ void Binding::_checkBindingID() } - - - // XValueBinding @@ -1080,7 +1071,6 @@ void Binding::setValue( const css::uno::Any& aValue ) } - // XListEntry Source @@ -1175,7 +1165,6 @@ void Binding::removeListEntryListener( const css::uno::Reference<css::form::bind } - // XValidator @@ -1224,8 +1213,6 @@ void Binding::removeValidityConstraintListener( } - - // xml::dom::event::XEventListener @@ -1258,7 +1245,6 @@ void Binding::handleEvent( const css::uno::Reference<css::xml::dom::events::XEve } - // lang::XUnoTunnel @@ -1353,8 +1339,6 @@ void Binding::removeModifyListener( } - - OUString Binding::getName() throw( RuntimeException, std::exception ) { diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index 0d79f9458632..a413e39eda63 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -59,7 +59,6 @@ namespace com { namespace sun { namespace star { } } } - namespace xforms { @@ -93,7 +92,6 @@ public: typedef std::vector<css::uno::Reference<css::form::binding::XListEntryListener> > XListEntryListeners_t; - private: /// the Model to which this Binding belongs; may be NULL @@ -223,8 +221,6 @@ public: // - p3ptype (static; no default) - - /// get this binding's context node xforms::EvaluationContext getEvaluationContext() const; @@ -344,8 +340,6 @@ public: css::uno::RuntimeException, std::exception ) override; - - // XListEntry Source @@ -368,8 +362,6 @@ public: css::uno::RuntimeException, std::exception ) override; - - // XValidator: @@ -392,7 +384,6 @@ public: css::uno::RuntimeException, std::exception ) override; - // XModifyBroadcaster & friends: // inform listeners about changes in our values @@ -408,9 +399,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - - - // XNamed: // get/set name @@ -424,8 +412,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - - // xml::dom::event::XEventListener // receive an event if our node changed @@ -435,8 +421,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - - // XUnoTunnel @@ -444,7 +428,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - // XCloneable diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index 08fc7511f460..c327e5dd1623 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -72,7 +72,6 @@ ComputedExpression::~ComputedExpression() } - void ComputedExpression::setExpression( const OUString& rExpression ) { // set new expression, and clear pre-computed results @@ -166,8 +165,6 @@ bool ComputedExpression::getBool( bool bDefault ) const } - - Reference<XXPathAPI> ComputedExpression::_getXPathAPI(const xforms::EvaluationContext& aContext) { // create XPath API, then register namespaces diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx index 46a9eecf330d..1aa4ffc96111 100644 --- a/forms/source/xforms/computedexpression.hxx +++ b/forms/source/xforms/computedexpression.hxx @@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star namespace xforms { class EvaluationContext; } - namespace xforms { diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index ea35900c636e..fe2c371c1edc 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -161,7 +161,6 @@ namespace xforms } - Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration( ) throw (RuntimeException, std::exception) { return new ::comphelper::OEnumerationByName( this ); diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 48e5a813031c..016243a293a3 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -153,7 +153,6 @@ namespace xforms } - sal_Int16 SAL_CALL OXSDDataType::getTypeClass() throw (RuntimeException, std::exception) { return m_nTypeClass; @@ -656,7 +655,6 @@ namespace xforms } - // validate decimals and return code for which facets failed // to be used by: ODecimalType::validate and ODecimalType::explainInvalid sal_uInt16 ODecimalType::_validate( const OUString& rValue ) @@ -749,7 +747,6 @@ namespace xforms } \ - //= ODateType @@ -942,7 +939,6 @@ namespace xforms } - #define DATATYPES_INCLUDED_BY_MASTER_HEADER #include "datatypes_impl.hxx" #undef DATATYPES_INCLUDED_BY_MASTER_HEADER diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index ae5e32085d11..32688ef020a5 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -41,7 +41,6 @@ namespace xforms { - //= OXSDDataType typedef ::cppu::WeakImplHelper < css::xsd::XDataType diff --git a/forms/source/xforms/datatypes_impl.hxx b/forms/source/xforms/datatypes_impl.hxx index 6a22925e4922..cfc44dfb9414 100644 --- a/forms/source/xforms/datatypes_impl.hxx +++ b/forms/source/xforms/datatypes_impl.hxx @@ -59,7 +59,6 @@ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > } - template< typename VALUE_TYPE > OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const OUString& _rName, sal_Int16 _nTypeClass ) :OValueLimitedType_Base( _rName, _nTypeClass ) diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx index f37b99156a93..ddeb96864890 100644 --- a/forms/source/xforms/mip.cxx +++ b/forms/source/xforms/mip.cxx @@ -100,8 +100,6 @@ void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = tru void MIP::resetTypeName() { msTypeName.clear(); mbHasTypeName = false; } - - } // namespace xforms /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index b7fe53b77b33..1a0e50bc81b3 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -82,8 +82,6 @@ using namespace xforms; #endif - - // The Model @@ -97,7 +95,6 @@ void Model::ensureAtLeastOneInstance() } - /** Model default constructor; create empty model */ Model::Model() : msID(), @@ -215,7 +212,6 @@ void Model::dbg_assertInvariant() const #endif - // MIP management void Model::addMIP( void* pTag, const XNode_t& xNode, const MIP& rMIP ) { @@ -270,7 +266,6 @@ MIP Model::queryMIP( const XNode_t& xNode ) const } - void Model::rebind() { OSL_ENSURE( mpBindings != nullptr, "bindings?" ); @@ -286,7 +281,6 @@ void Model::rebind() } - void Model::deferNotifications( bool bDefer ) { // iterate over all bindings and defer notifications @@ -424,8 +418,6 @@ bool Model::isValid() const } - - // implement xforms::XModel @@ -554,8 +546,6 @@ css::uno::Reference<css::xml::dom::XDocument> SAL_CALL Model::getDefaultInstance } - - // bindings management @@ -590,8 +580,6 @@ css::uno::Reference<css::container::XSet> Model::getBindings() } - - // submission management diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index e7e732a2d437..222bb678d385 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -150,7 +150,6 @@ public: #endif - // MIP (model item property) management @@ -185,13 +184,10 @@ public: bool isValid() const; - - // XModel // implement the xforms::XModel implementation - virtual OUString SAL_CALL getID() throw( css::uno::RuntimeException, std::exception ) override; @@ -235,7 +231,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - // XModel: binding management virtual XPropertySet_t SAL_CALL createBinding() @@ -400,7 +395,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - // XUpdatable diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index 3f2752c314ed..c331861efd8d 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -119,7 +119,6 @@ public: }; - // helper functions diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index dd393299fe23..5f009de2d868 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -68,8 +68,6 @@ using namespace com::sun::star::xml::dom; using namespace com::sun::star::xml::xpath; - - // implement XFormsUIHelper1 @@ -259,7 +257,6 @@ OUString Model::getDefaultBindingExpressionForNode( } - OUString Model::getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw( RuntimeException, std::exception ) { @@ -956,7 +953,6 @@ void Model::setNodeValue( } - // helper functions from model_helper.hxx diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx index c8273224830b..2296d1df0138 100644 --- a/forms/source/xforms/pathexpression.cxx +++ b/forms/source/xforms/pathexpression.cxx @@ -55,8 +55,6 @@ using com::sun::star::xml::xpath::XPathObjectType_XPATH_UNDEFINED; using namespace std; - - namespace xforms { @@ -71,7 +69,6 @@ PathExpression::~PathExpression() } - void PathExpression::setExpression( const OUString& rExpression ) { // set new expression, and clear pre-computed results diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx index 38410f24f0d8..586e01a85e37 100644 --- a/forms/source/xforms/pathexpression.hxx +++ b/forms/source/xforms/pathexpression.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star } } } - namespace xforms { diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index a547e5c9274e..d7a0f2dc7e66 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -288,10 +288,6 @@ Submission* Submission::getSubmission( } - - - - void Submission::liveCheck() throw( RuntimeException ) { @@ -310,7 +306,6 @@ Model* Submission::getModelImpl() const } - // Property-Set implementation @@ -400,7 +395,6 @@ void SAL_CALL Submission::setName( const OUString& sID ) } - sal_Int64 SAL_CALL Submission::getSomething( const Sequence<sal_Int8>& aId ) throw( RuntimeException, std::exception ) diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index 8556f9b0b783..51158aa92691 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -203,8 +203,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - - // XUnoTunnel @@ -213,7 +211,6 @@ public: throw( css::uno::RuntimeException, std::exception ) override; - // XSubmission diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index a120e95e4e08..18c33281e9d9 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -41,7 +41,6 @@ using namespace ucbhelper; using namespace std; - CSubmissionGet::CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment) : CSubmission(aURL, aFragment) { diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index 60cce0dd64f4..0580cf5eba5f 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -38,7 +38,6 @@ using namespace ucbhelper; using namespace std; - CSubmissionPost::CSubmissionPost(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment) : CSubmission(aURL, aFragment) { diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx index f9b58f0477e0..e23cf10fa841 100644 --- a/forms/source/xforms/xmlhelper.cxx +++ b/forms/source/xforms/xmlhelper.cxx @@ -33,7 +33,6 @@ using com::sun::star::xml::dom::DocumentBuilder; using com::sun::star::xml::dom::XDocumentBuilder; - // determine valid XML name diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx index b1b4f64f1940..a25f60837256 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -36,8 +36,6 @@ #include <com/sun/star/xml/dom/XNode.hpp> - - class CLibxml2XFormsExtension : public cppu::WeakImplHelper< css::xml::xpath::XXPathExtension, css::lang::XInitialization> { diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index ca9928fb748b..b6c0d74b4391 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -336,7 +336,6 @@ bool FormulaToken::TextEqual( const FormulaToken& rToken ) const // real implementations of virtual functions - sal_uInt8 FormulaByteToken::GetByte() const { return nByte; } void FormulaByteToken::SetByte( sal_uInt8 n ) { nByte = n; } bool FormulaByteToken::IsInForceArray() const { return bIsInForceArray; } @@ -1013,7 +1012,6 @@ FormulaToken* FormulaTokenArray::AddStringXML( const OUString& rStr ) } - void FormulaTokenArray::AddRecalcMode( ScRecalcMode nBits ) { //! Order is important. @@ -1714,7 +1712,6 @@ bool FormulaTokenIterator::IsEndOfPath() const } - // real implementations of virtual functions diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx index 51989f2170e5..fbd6aa389657 100644 --- a/formula/source/core/inc/core_resource.hxx +++ b/formula/source/core/inc/core_resource.hxx @@ -67,7 +67,6 @@ namespace formula }; - } // formula diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 62bcfeb43300..0057a3afde2e 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -81,7 +81,6 @@ private: }; - // class ArgInput class ArgInput diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 1e296f710709..d074de9a3bc6 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -123,7 +123,6 @@ bool FormulaHelper::GetNextFunc( const OUString& rFormula, } - void FormulaHelper::FillArgStrings( const OUString& rFormula, sal_Int32 nFuncPos, sal_uInt16 nArgs, @@ -163,7 +162,6 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula, } - void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, const OUString& rFormula, sal_Int32 nFuncPos, @@ -176,7 +174,6 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, } - inline bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos ) { if( _pCharClass->isLetterNumeric( rStr, nPos ) ) @@ -283,7 +280,6 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula, } - sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart ) const { sal_Int32 nStrLen = rStr.getLength(); @@ -341,7 +337,6 @@ sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart } - sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sal_uInt16 nArg ) const { sal_Int32 nStrLen = rStr.getLength(); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 5ae6e48825cc..f8229a1c45e6 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1071,13 +1071,9 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) } - - // Functions for 1. Page - - // Handler for Listboxes IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) @@ -1111,7 +1107,6 @@ IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) } - // Functions for right Page void FormulaDlg_Impl::SetData(sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int32 nNextFEnd, sal_Int32& PrivStart, sal_Int32& PrivEnd) diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 05ab42c6d4b6..c6eaea1f818a 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -54,7 +54,6 @@ public: }; - typedef const IFunctionDescription* TFunctionDesc; class FuncPage : public TabPage diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index ed9aa3ef3d27..ce3d9970125e 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -594,7 +594,6 @@ IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) } - IMPL_LINK_TYPED( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); @@ -656,7 +655,6 @@ IMPL_LINK_TYPED( ParaWin, ModifyHdl, ArgInput&, rPtr, void ) } - } // formula /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 4c6ec6e38bb2..f21eef3c9eef 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -152,7 +152,6 @@ public: }; - } // formula #endif // INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index c2a66906179e..e88ec26a4010 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -31,8 +31,6 @@ #include "formula/omoduleclient.hxx" - - namespace formula { @@ -65,7 +63,6 @@ public: }; - class StructPage : public TabPage { private: diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 31adbc8c33a6..75e1d6022534 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -59,7 +59,6 @@ namespace svt #define PROPERTY_FLAG_CHECKED 0x00000080 - struct ControlDescription { const sal_Char* pControlName; @@ -122,7 +121,6 @@ namespace svt }; - struct ControlProperty { const sal_Char* pPropertyName; diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index dfe51fc8fac8..c0995cda6c5f 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -30,7 +30,6 @@ namespace svt { - namespace InternalFilePickerElementIds { static const sal_Int16 PUSHBUTTON_HELP = (sal_Int16)0x1000; diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 938e2a800d96..8001885df0af 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -53,7 +53,6 @@ using namespace ::com::sun::star::awt; using namespace ::utl; - struct FilterEntry { protected: @@ -89,8 +88,6 @@ public: }; - - FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) @@ -232,7 +229,6 @@ IMPL_LINK_TYPED( SvtFilePicker, DialogClosedHdl, Dialog&, rDlg, void ) // SvtFilePicker - WinBits SvtFilePicker::getWinBits( WinBits& rExtraBits ) { // set the winbits for creating the filedialog @@ -493,7 +489,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER3( SvtRemoteFilePicker, SvtFilePicker, OCommonPic // XExecutableDialog functions - void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) { OCommonPicker::setTitle( _rTitle ); @@ -509,7 +504,6 @@ sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException, std::exce // XAsynchronousExecutableDialog functions - void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException, std::exception) { setTitle( _rTitle ); @@ -663,7 +657,6 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID, } - Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction ) throw( RuntimeException, std::exception ) { @@ -699,7 +692,6 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc } - void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue ) throw ( RuntimeException, std::exception ) { @@ -1026,7 +1018,6 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter() } - // XInitialization functions @@ -1106,7 +1097,6 @@ bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, co } - return OCommonPicker::implHandleInitializationArgument( _rName, _rValue ); } diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 25fad322970d..fe9eeaa44c30 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -163,7 +163,6 @@ public: virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& aFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - // these methods are here because they're ambiguous virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) override diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index 981cc5263b75..d25710f3e203 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -34,8 +34,6 @@ namespace svt { - - //= AsyncPickerAction class AsyncPickerAction : public salhelper::SimpleReferenceObject diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index e560f58fc1dc..200c8226cba8 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -196,7 +196,6 @@ namespace svt } - bool OCommonPicker::createPicker() { if ( !m_pDlg ) diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx index a991e3044529..03a47dd89441 100644 --- a/fpicker/source/office/fpinteraction.cxx +++ b/fpicker/source/office/fpinteraction.cxx @@ -115,8 +115,6 @@ namespace svt } - - void OFilePickerInteractionHandler::resetUseState() { m_bUsed = false; diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index bfac7d9bc9e3..eed25afff490 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OFilePickerInteractionHandler typedef ::cppu::WeakImplHelper < css::task::XInteractionHandler diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index c37db2f933be..f1e70632c31a 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -31,7 +31,6 @@ namespace svt { - //= SmartContent /** a "smart content" which basically wraps an UCB content, but caches some information diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 6584d1ab9f45..22a49d928998 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -325,7 +325,6 @@ SvtFileDialog::SvtFileDialog } - SvtFileDialog::SvtFileDialog ( vcl::Window* _pParent, WinBits nBits ) :SvtFileDialog_Base( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" ) ,_pCbReadOnly( nullptr ) @@ -1225,14 +1224,12 @@ void SvtFileDialog::OpenHdl_Impl(void* pVoid) } - void SvtFileDialog::EnableAutocompletion( bool _bEnable ) { _pImp->_pEdFileName->EnableAutocompletion( _bEnable ); } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void ) { OUString sSelectedFilterDisplayName; @@ -1318,14 +1315,12 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameGetFocusHdl_Impl, Control&, void ) } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameModifiedHdl_Impl, Edit&, void ) { FileNameGetFocusHdl_Impl( *_pImp->_pEdFileName ); } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void ) { OUString aPath = _pImp->_pEdCurrentPath->GetURL(); @@ -1333,7 +1328,6 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void ) } - IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void ) { _pFileView->EndInplaceEditing( false ); @@ -1357,7 +1351,6 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void } - IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) { // Maybe open the PlacesDialog would have been a better idea @@ -1370,14 +1363,12 @@ IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) } - IMPL_LINK_NOARG_TYPED ( SvtFileDialog, RemovePlacePressed_Hdl, Button*, void ) { _pImp->_pPlaces->RemoveSelectedPlace(); } - SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl ( const OUString& _rFilter, @@ -1438,7 +1429,6 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl } - void SvtFileDialog::ExecuteFilter() { _pImp->m_bNeedDelayedFilterExecute = false; @@ -1446,7 +1436,6 @@ void SvtFileDialog::ExecuteFilter() } - void SvtFileDialog::OpenMultiSelection_Impl() /* [Description] @@ -1465,7 +1454,6 @@ void SvtFileDialog::OpenMultiSelection_Impl() } - void SvtFileDialog::UpdateControls( const OUString& rURL ) { _pImp->_pEdFileName->SetBaseURL( rURL ); @@ -1518,7 +1506,6 @@ void SvtFileDialog::UpdateControls( const OUString& rURL ) } - IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); @@ -1570,7 +1557,6 @@ IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void ) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) { _pImp->_bDoubleClick = true; @@ -1581,14 +1567,12 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, EntrySelectHdl_Impl, ComboBox&, void) { FileSelect(); } - IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) { OUString sCurrentFolder( pView->GetViewURL() ); @@ -1610,7 +1594,6 @@ IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) { if ( _pFileNotifier ) @@ -1622,7 +1605,6 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) { if ( ! _pFileNotifier ) @@ -1648,7 +1630,6 @@ IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) } - IMPL_LINK_NOARG_TYPED(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) { if ( _pFileNotifier ) @@ -1657,7 +1638,6 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) } - bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) /* [Description] @@ -1690,7 +1670,6 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) } - class SvtDefModalDialogParent_Impl { private: @@ -1917,7 +1896,6 @@ void SvtFileDialog::EnableControl( Control* _pControl, bool _bEnable ) } - short SvtFileDialog::PrepareExecute() { OUString aEnvValue; @@ -2123,7 +2101,6 @@ void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action _eAction, } - void SvtFileDialog::FileSelect() { if ( _pFileNotifier ) @@ -2131,7 +2108,6 @@ void SvtFileDialog::FileSelect() } - void SvtFileDialog::FilterSelect() { if ( _pFileNotifier ) @@ -2140,7 +2116,6 @@ void SvtFileDialog::FilterSelect() } - void SvtFileDialog::SetStandardDir( const OUString& rStdDir ) /* [Description] @@ -2161,7 +2136,6 @@ void SvtFileDialog::SetBlackList( const css::uno::Sequence< OUString >& rBlackLi } - const css::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const { return _pImp->GetBlackList(); @@ -2180,7 +2154,6 @@ const OUString& SvtFileDialog::GetStandardDir() const } - void SvtFileDialog::PrevLevel_Impl() { _pFileView->EndInplaceEditing( false ); @@ -2190,7 +2163,6 @@ void SvtFileDialog::PrevLevel_Impl() } - void SvtFileDialog::OpenURL_Impl( const OUString& _rURL ) { _pFileView->EndInplaceEditing( false ); @@ -2211,7 +2183,6 @@ SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const OUString& _rFilter } - void SvtFileDialog::AddFilter( const OUString& _rFilter, const OUString& _rType ) { DBG_ASSERT( !IsInExecute(), "SvtFileDialog::AddFilter: currently executing!" ); @@ -2250,7 +2221,6 @@ void SvtFileDialog::SetCurFilter( const OUString& rFilter ) } - OUString SvtFileDialog::GetCurFilter() const { OUString aFilter; @@ -2268,14 +2238,12 @@ OUString SvtFileDialog::getCurFilter( ) const } - sal_uInt16 SvtFileDialog::GetFilterCount() const { return _pImp->m_aFilter.size(); } - const OUString& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < GetFilterCount(), "invalid index" ); @@ -2283,7 +2251,6 @@ const OUString& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const } - void SvtFileDialog::InitSize() { if ( _pImp->_aIniKey.isEmpty() ) @@ -2304,7 +2271,6 @@ void SvtFileDialog::InitSize() } - std::vector<OUString> SvtFileDialog::GetPathList() const { std::vector<OUString> aList; diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 9469078c93f9..581e42c7234c 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -292,28 +292,24 @@ private: }; - inline void SvtFileDialog::SetPath( const OUString& rNewURL ) { _aPath = rNewURL; } - inline void SvtFileDialog::SetHasFilename( bool bHasFilename ) { m_bHasFilename = bHasFilename; } - inline const OUString& SvtFileDialog::GetPath() { return _aPath; } - inline void SvtFileDialog::SetDefaultExt( const OUString& rExt ) { _aDefExt = rExt; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index c5e0552a7970..9597346505b7 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -77,7 +77,6 @@ SvtFileDialogFilter_Impl::SvtFileDialogFilter_Impl( const OUString& rName, const } - SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl() { } @@ -86,11 +85,9 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl() // SvtFileDialogFilterList_Impl - //= SvtFileDialogURLSelector - SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ) :MenuButton ( _pParent, nBits ) ,m_pDlg ( _pDlg ) @@ -129,7 +126,6 @@ void SvtFileDialogURLSelector::Activate() //= SvtUpButton_Impl - SvtUpButton_Impl::SvtUpButton_Impl( vcl::Window *pParent, SvtFileDialog* pDlg, WinBits nBits ) :SvtFileDialogURLSelector( pParent, pDlg, nBits, IMG_FILEDLG_BTN_UP ) { @@ -244,7 +240,6 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits ) : } - SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl() { _pBtnUp.disposeAndClear(); @@ -253,7 +248,6 @@ SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl() } - void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir ) { _aStdDir = _rDir; @@ -304,7 +298,6 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl* } - void SvtExpFileDlg_Impl::InitFilterList( ) { // clear the current list diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx index 84e2ba7e6fd2..115d6fb83017 100644 --- a/fpicker/source/office/pickercallbacks.hxx +++ b/fpicker/source/office/pickercallbacks.hxx @@ -30,7 +30,6 @@ namespace svt { - class IFilePickerController { public: diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index 2ee969cb63da..99fe074e7a20 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -47,9 +47,6 @@ using ::com::sun::star::ui::dialogs::XFilePicker; using ::com::sun::star::ui::dialogs::XFilePicker2; - - - static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx index 6e4b24201504..25d2ebe78de3 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx @@ -66,9 +66,6 @@ namespace /* private */ }; - - - CFileOpenDialog::CFileOpenDialog( bool bFileOpenDialog, sal_uInt32 dwFlags, @@ -127,17 +124,11 @@ CFileOpenDialog::CFileOpenDialog( } - - - CFileOpenDialog::~CFileOpenDialog() { } - - - void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle) { m_dialogTitle = aTitle; @@ -145,9 +136,6 @@ void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle) } - - - void CFileOpenDialog::setFilter(const OUString& aFilter) { // Format is like @@ -160,9 +148,6 @@ void CFileOpenDialog::setFilter(const OUString& aFilter) } - - - bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex) { OSL_ASSERT(aIndex > 0); @@ -171,18 +156,12 @@ bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex) } - - - sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const { return m_ofn.nFilterIndex; } - - - void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName) { m_fileNameBuffer.setLength(0); @@ -191,9 +170,6 @@ void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName) } - - - void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory) { m_displayDirectory = aDirectory; @@ -201,18 +177,12 @@ void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory) } - - - OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const { return m_displayDirectory; } - - - OUString SAL_CALL CFileOpenDialog::getFullFileName() const { return OUString(m_fileNameBuffer.getStr(), @@ -220,18 +190,12 @@ OUString SAL_CALL CFileOpenDialog::getFullFileName() const } - - - OUString SAL_CALL CFileOpenDialog::getFileName() const { return OUString(m_fileTitleBuffer.getStr()); } - - - OUString CFileOpenDialog::getFileExtension() { if (m_ofn.nFileExtension) @@ -242,9 +206,6 @@ OUString CFileOpenDialog::getFileExtension() } - - - void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension) { m_defaultExtension = aExtension; @@ -252,9 +213,6 @@ void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension) } - - - void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode) { if (bMode) @@ -264,18 +222,12 @@ void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode) } - - - bool SAL_CALL CFileOpenDialog::getMultiSelectionMode() const { return ((m_ofn.Flags & OFN_ALLOWMULTISELECT) > 0); } - - - sal_Int16 SAL_CALL CFileOpenDialog::doModal() { sal_Int16 nRC = -1; @@ -305,27 +257,18 @@ sal_Int16 SAL_CALL CFileOpenDialog::doModal() } - - - sal_uInt32 SAL_CALL CFileOpenDialog::getLastDialogError() const { return CommDlgExtendedError(); } - - - bool SAL_CALL CFileOpenDialog::preModal() { return sal_True; } - - - void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult) { OSL_ASSERT((-1 <= nDialogResult) && (nDialogResult <= 1)); @@ -340,9 +283,6 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult) } - - - OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const { OSL_ASSERT(IsWindow(m_hwndFileOpenDlg)); @@ -362,9 +302,6 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const } - - - OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const { OSL_ASSERT(IsWindow(m_hwndFileOpenDlg)); @@ -384,9 +321,6 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const } - - - OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const { OSL_ASSERT(IsWindow(m_hwndFileOpenDlg)); @@ -406,77 +340,50 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&) { return 0; } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onFileOk() { return 0; } - - - void SAL_CALL CFileOpenDialog::onSelChanged(HWND) { } - - - void SAL_CALL CFileOpenDialog::onHelp() { } - - - void SAL_CALL CFileOpenDialog::onInitDone() { centerPositionToParent(); } - - - void SAL_CALL CFileOpenDialog::onFolderChanged() { } - - - void SAL_CALL CFileOpenDialog::onTypeChanged(sal_uInt32) { } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16) { return 0; } - - - sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify ) { switch(lpOfNotify->hdr.code) @@ -513,9 +420,6 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify ) } - - - void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild) { m_hwndFileOpenDlg = hwndDlg; @@ -528,9 +432,6 @@ void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild) } - - - UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc( HWND hChildDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { @@ -579,9 +480,6 @@ UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc( } - - - LRESULT CALLBACK CFileOpenDialog::BaseDlgProc( HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam) { @@ -608,9 +506,6 @@ LRESULT CALLBACK CFileOpenDialog::BaseDlgProc( } - - - CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd) { OSL_ASSERT(IsWindow( hwnd)); @@ -619,9 +514,6 @@ CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd) } - - - void SAL_CALL CFileOpenDialog::centerPositionToParent() const { OSL_PRECOND(IsWindow(m_hwndFileOpenDlg), "no dialog window, call method only after or in onInitDone"); diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx index 8f532b363890..6d2d6553e50d 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx @@ -113,7 +113,6 @@ typedef _LPOPENFILENAMEA _LPOPENFILENAME; #endif // (_WIN32_WINNT >= 0x0500) - // A simple wrapper class around the Win32 GetOpenFileName API. // This class is not thread-safe and only one instance at a // time is allowed diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 9a3c4552db27..2db06916ef15 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -65,9 +65,6 @@ namespace } - - - CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) : CFilePicker_Base(m_rbHelperMtx), m_xServiceMgr(xServiceMgr), @@ -103,9 +100,6 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke } - - - void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePickerListener>& xListener ) throw(uno::RuntimeException) { @@ -130,9 +124,6 @@ void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno: } - - - void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) { aEvent.Source.set(static_cast<XFilePickerNotifier*>(this)); @@ -141,9 +132,6 @@ void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) } - - - void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) { aEvent.Source.set(static_cast<XFilePickerNotifier*>(this)); @@ -152,9 +140,6 @@ void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) } - - - void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent) { aEvent.Source.set(static_cast<XFilePickerNotifier*>(this)); @@ -163,9 +148,6 @@ void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent) } - - - void SAL_CALL CFilePicker::dialogSizeChanged() { m_aAsyncEventNotifier.notifyEvent( @@ -219,36 +201,24 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const } - - - bool CFilePicker::startupEventNotification(bool bStartupSuspended) { return m_aAsyncEventNotifier.startup(bStartupSuspended); } - - - void CFilePicker::shutdownEventNotification() { m_aAsyncEventNotifier.shutdown(); } - - - void CFilePicker::suspendEventNotification() { m_aAsyncEventNotifier.suspend(); } - - - void CFilePicker::resumeEventNotification() { m_aAsyncEventNotifier.resume(); @@ -266,9 +236,6 @@ void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::Runt } - - - void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -277,9 +244,6 @@ void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeEx } - - - void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter) throw(lang::IllegalArgumentException, uno::RuntimeException) { @@ -289,9 +253,6 @@ void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& } - - - void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle) throw(lang::IllegalArgumentException, uno::RuntimeException) { @@ -301,9 +262,6 @@ void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle) } - - - OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -312,9 +270,6 @@ OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException) } - - - void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -324,9 +279,6 @@ void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const } - - - void SAL_CALL CFilePicker::setDefaultName(const OUString& aName) throw(uno::RuntimeException) { @@ -336,9 +288,6 @@ void SAL_CALL CFilePicker::setDefaultName(const OUString& aName) } - - - void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory) throw(lang::IllegalArgumentException, uno::RuntimeException) { @@ -348,9 +297,6 @@ void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory) } - - - OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -359,9 +305,6 @@ OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException } - - - uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -370,8 +313,6 @@ uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeExcep } - - uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException, std::exception) { OSL_ASSERT(0 != m_pImpl.get()); @@ -410,9 +351,6 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R } - - - sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -455,9 +393,6 @@ void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlActi } - - - uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControlAction) throw(uno::RuntimeException) { @@ -468,9 +403,6 @@ uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControl } - - - void SAL_CALL CFilePicker::enableControl(sal_Int16 aControlId, sal_Bool bEnable) throw(uno::RuntimeException) { @@ -481,9 +413,6 @@ throw(uno::RuntimeException) } - - - void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel) throw (uno::RuntimeException) { @@ -494,9 +423,6 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel } - - - OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId) throw (uno::RuntimeException) { @@ -507,9 +433,6 @@ OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId) } - - - uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -519,9 +442,6 @@ uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw } - - - sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -531,9 +451,6 @@ sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeExcepti } - - - sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -543,9 +460,6 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException } - - - sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -555,9 +469,6 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeExceptio } - - - void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aImage) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -568,9 +479,6 @@ void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aIma } - - - sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -580,9 +488,6 @@ sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::Run } - - - sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException) { OSL_ASSERT(0 != m_pImpl.get()); @@ -592,9 +497,6 @@ sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException) } - - - void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) throw( uno::Exception, uno::RuntimeException) { @@ -693,9 +595,6 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) } - - - void SAL_CALL CFilePicker::cancel() throw(uno::RuntimeException) { diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx index 21a6e0e181a8..a76afac50cc8 100644 --- a/fpicker/source/win32/filepicker/FilterContainer.cxx +++ b/fpicker/source/win32/filepicker/FilterContainer.cxx @@ -35,8 +35,6 @@ // namespace directives - - // ctor @@ -139,9 +137,6 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& } - - - sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const { sal_Bool bRet = sal_True; @@ -160,9 +155,6 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFi } - - - sal_Int32 SAL_CALL CFilterContainer::getFilterPos( const OUString& aName ) const { return getFilterTagPos( aName ); @@ -229,9 +221,6 @@ OUString SAL_CALL CFilterContainer::getCurrentFilter() const } - - - // calculates the length of a '\0' separated filter, that means // length of the name + '\0' + length of the filter string + // a trailing '\0' @@ -262,9 +251,6 @@ static sal_uInt32 _getTotalFilterLength( CFilterContainer& aFilterContainer ) } - - - inline void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength ) { diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 56ac6b1d54a1..ae08d3633c2d 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -36,7 +36,6 @@ namespace vista{ // types, const etcpp. - /** todo document me */ class IVistaFilePickerInternalNotify diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx index e761e7714139..381a5cb66b6e 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx @@ -61,9 +61,6 @@ namespace // private }; - - - inline sal_Int32 SubDiv( sal_Int32 nNumber, sal_Int32 nMinuend, sal_Int32 nDenominator ) { @@ -81,9 +78,6 @@ namespace // private } - - - inline sal_uInt32 _getWidthRect( const RECT& aRect ) { @@ -91,9 +85,6 @@ namespace // private } - - - inline sal_uInt32 _getHeightRect( const RECT& aRect ) { @@ -183,7 +174,6 @@ namespace // private } // end namespace - // to ensure only one instance (singleton) @@ -219,9 +209,6 @@ CFilePreview* CFilePreview::createInstance( } - - - CFilePreview::CFilePreview( HWND aParent, POINT ulCorner, @@ -273,9 +260,6 @@ CFilePreview::CFilePreview( } - - - CFilePreview::~CFilePreview( ) { // unregister preview window class @@ -366,9 +350,6 @@ sal_Bool SAL_CALL CFilePreview::getPos( POINT& ulCorner ) const } - - - void SAL_CALL CFilePreview::enable( sal_Bool bEnable ) { m_bEnabled = bEnable; @@ -426,9 +407,6 @@ sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName ) } - - - void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC ) { OSL_PRECOND( IsWindow( m_hwnd ), "Preview window not initialized" ); @@ -479,9 +457,6 @@ void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC ) } - - - sal_Bool CFilePreview::loadFile( const OUString& aFileName ) { HANDLE hFile = 0; @@ -550,9 +525,6 @@ CLEANUP_AND_EXIT: } - - - LRESULT CALLBACK CFilePreview::WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { @@ -591,5 +563,4 @@ LRESULT CALLBACK CFilePreview::WndProc( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 742ebfd14450..9e15e2dde1b3 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -332,9 +332,6 @@ void SAL_CALL VistaFilePicker::setValue( ::sal_Int16 nControlId , } - - - css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId , ::sal_Int16 nControlAction) throw(css::uno::RuntimeException) @@ -350,9 +347,6 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId , } - - - void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId, sal_Bool bEnable ) throw(css::uno::RuntimeException) @@ -366,9 +360,6 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId, } - - - void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId, const OUString& sLabel ) throw (css::uno::RuntimeException) @@ -382,9 +373,6 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId, } - - - OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId) throw (css::uno::RuntimeException) { @@ -398,9 +386,6 @@ OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId) } - - - css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFormats() throw (css::uno::RuntimeException) { @@ -408,9 +393,6 @@ css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFor } - - - sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth() throw (css::uno::RuntimeException) { @@ -418,9 +400,6 @@ sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth() } - - - sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth() throw (css::uno::RuntimeException) { @@ -428,9 +407,6 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth() } - - - sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight() throw (css::uno::RuntimeException) { @@ -438,9 +414,6 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight() } - - - void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/, const css::uno::Any& /*aImage */) throw (css::lang::IllegalArgumentException, @@ -449,9 +422,6 @@ void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/, } - - - sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/) throw (css::uno::RuntimeException) { @@ -459,9 +429,6 @@ sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/) } - - - sal_Bool SAL_CALL VistaFilePicker::getShowState() throw (css::uno::RuntimeException) { @@ -469,9 +436,6 @@ sal_Bool SAL_CALL VistaFilePicker::getShowState() } - - - void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -599,9 +563,6 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An } - - - void SAL_CALL VistaFilePicker::cancel() throw(css::uno::RuntimeException) { diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index 98a61afc0b24..f7eca8ead2ae 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -48,7 +48,6 @@ namespace vista{ // types, const etcpp. - /** todo document me */ class VistaFilePickerEventHandler : public ::cppu::BaseMutex @@ -127,7 +126,6 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex // native interface - /** start listening for file picker events on the given file open dialog COM object. * * The broadcaster will be cached internally so deregistration will be easy. diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index da5eb5a4b9fc..90dc17c808cf 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -85,7 +85,6 @@ namespace vista{ // types, const etcpp. - static const ::sal_Int16 INVALID_CONTROL_ID = -1; static const ::sal_Int16 INVALID_CONTROL_ACTION = -1; diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index f6714cad191e..5a82692af2f2 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -145,9 +145,6 @@ OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException) } - - - void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName) throw( IllegalArgumentException, uno::RuntimeException ) { @@ -261,9 +258,6 @@ OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeExcepti } - - - inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator() { m_filterContainer->addFilter(FILTER_SEPARATOR, ALL_FILES_WILDCARD, ALLOW_DUPLICATES); @@ -347,9 +341,6 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEna } - - - void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel ) throw (uno::RuntimeException) { @@ -359,9 +350,6 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& } - - - OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId ) throw (uno::RuntimeException) { @@ -373,9 +361,6 @@ OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId ) } - - - uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats() throw (uno::RuntimeException) { @@ -383,9 +368,6 @@ uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats() } - - - sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth() throw (uno::RuntimeException) { @@ -393,9 +375,6 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth() } - - - sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth() throw (uno::RuntimeException) { @@ -403,9 +382,6 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth() } - - - sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight() throw (uno::RuntimeException) { @@ -413,9 +389,6 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight() } - - - void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& aImage) throw (IllegalArgumentException, uno::RuntimeException) { @@ -423,9 +396,6 @@ void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& } - - - sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState) throw (uno::RuntimeException) { @@ -433,9 +403,6 @@ sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState) } - - - sal_Bool SAL_CALL CWinFileOpenImpl::getShowState() throw (uno::RuntimeException) { @@ -443,9 +410,6 @@ sal_Bool SAL_CALL CWinFileOpenImpl::getShowState() } - - - void SAL_CALL CWinFileOpenImpl::cancel() { if (IsWindow(m_hwndFileOpenDlg)) @@ -478,9 +442,6 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::getFocused() } - - - inline sal_Bool SAL_CALL CWinFileOpenImpl::IsCustomControlHelpRequested(LPHELPINFO lphi) const { return ((lphi->iCtrlId != IDOK) && (lphi->iCtrlId != IDCANCEL) && (lphi->iCtrlId < ctlFirst)); @@ -560,9 +521,6 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc( } - - - void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd) { @@ -596,9 +554,6 @@ void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl) } - - - void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd) { OSL_ASSERT(m_FilePickerState && m_NonExecuteFilePickerState); @@ -606,9 +561,6 @@ void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd) } - - - BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam) { EnumParam* enumParam = (EnumParam*)lParam; @@ -638,9 +590,6 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam) } - - - sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk() { m_NonExecuteFilePickerState->reset(); @@ -656,9 +605,6 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk() } - - - void SAL_CALL CWinFileOpenImpl::onSelChanged(HWND) { // the windows file open dialog sends an initial @@ -793,9 +739,6 @@ void SAL_CALL CWinFileOpenImpl::onInitDone() } - - - void SAL_CALL CWinFileOpenImpl::onFolderChanged() { FilePickerEvent evt; @@ -803,9 +746,6 @@ void SAL_CALL CWinFileOpenImpl::onFolderChanged() } - - - void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32) { SetDefaultExtension(); @@ -835,9 +775,6 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand( } - - - void CWinFileOpenImpl::onWMSize() { m_Preview->notifyParentSizeChanged(); @@ -846,27 +783,18 @@ void CWinFileOpenImpl::onWMSize() } - - - void CWinFileOpenImpl::onWMShow(sal_Bool bShow) { m_Preview->notifyParentShow(bShow); } - - - void CWinFileOpenImpl::onWMWindowPosChanged() { m_Preview->notifyParentWindowPosChanged(); } - - - void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi) { FilePickerEvent evt; @@ -884,9 +812,6 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi) } - - - void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg) { // subclass the dialog window @@ -925,9 +850,6 @@ void CWinFileOpenImpl::postModal(sal_Int16 nDialogResult) } - - - void SAL_CALL CWinFileOpenImpl::SetDefaultExtension() { HWND hwndChkSaveWithExt = GetDlgItem(m_hwndFileOpenDlgChild, 100); @@ -975,9 +897,6 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension() } - - - void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName() { // manually setting the file name that appears diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index 8ec54626006f..08b61f8a181c 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -28,16 +28,10 @@ #include "SolarMutex.hxx" - - - using namespace com::sun::star; using ::com::sun::star::ui::dialogs::XFilePickerListener; - - - CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelper) : m_hThread(0), m_bRun(false), @@ -60,9 +54,6 @@ CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelpe } - - - CAsyncEventNotifier::~CAsyncEventNotifier() { OSL_ENSURE(0 == m_hThread,"Thread not stopped, destroying this instance leads to desaster"); @@ -72,9 +63,6 @@ CAsyncEventNotifier::~CAsyncEventNotifier() } - - - void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& aType , const uno::Reference< uno::XInterface >& xListener) { @@ -88,9 +76,6 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& } - - - void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& aType , const uno::Reference< uno::XInterface >& xListener) { @@ -101,9 +86,6 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& } - - - bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) { osl::MutexGuard aGuard(m_Mutex); @@ -133,9 +115,6 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) } - - - void SAL_CALL CAsyncEventNotifier::shutdown() { OSL_PRECOND(GetCurrentThreadId() != m_ThreadId, @@ -171,27 +150,18 @@ void SAL_CALL CAsyncEventNotifier::shutdown() } - - - void CAsyncEventNotifier::suspend() { ResetEvent(m_ResumeNotifying); } - - - void CAsyncEventNotifier::resume() { SetEvent(m_ResumeNotifying); } - - - void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotification) { osl::MutexGuard aGuard(m_Mutex); @@ -206,9 +176,6 @@ void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotifica } - - - size_t SAL_CALL CAsyncEventNotifier::getEventListSize() { osl::MutexGuard aGuard(m_Mutex); @@ -216,9 +183,6 @@ size_t SAL_CALL CAsyncEventNotifier::getEventListSize() } - - - void SAL_CALL CAsyncEventNotifier::resetNotifyEvent() { osl::MutexGuard aGuard(m_Mutex); @@ -227,9 +191,6 @@ void SAL_CALL CAsyncEventNotifier::resetNotifyEvent() } - - - CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord() { osl::MutexGuard aGuard(m_Mutex); @@ -237,9 +198,6 @@ CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord() } - - - void SAL_CALL CAsyncEventNotifier::removeNextEventRecord() { osl::MutexGuard aGuard(m_Mutex); @@ -247,9 +205,6 @@ void SAL_CALL CAsyncEventNotifier::removeNextEventRecord() } - - - void SAL_CALL CAsyncEventNotifier::run() { while (m_bRun) @@ -293,9 +248,6 @@ void SAL_CALL CAsyncEventNotifier::run() } - - - unsigned int WINAPI CAsyncEventNotifier::ThreadProc(LPVOID pParam) { osl_setThreadName("fpicker CAsyncEventNotifier::run()"); diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx index b5d4d1735c86..72f6525934e7 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx @@ -37,9 +37,6 @@ #include "eventnotification.hxx" - - - class CAsyncEventNotifier { public: diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx index 79bacd63d709..4dc8950566d1 100644 --- a/fpicker/source/win32/filepicker/controlaccess.cxx +++ b/fpicker/source/win32/filepicker/controlaccess.cxx @@ -30,11 +30,9 @@ // which contains function pointer to control action functions - // namespace directives - namespace // private { @@ -108,9 +106,6 @@ namespace // private }; - - - CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_SETVALUE_FUNCTION_T* aCtrlSetValueFunctionTable, size_t aTableSize, sal_Int16 aCtrlAction ) { @@ -123,9 +118,6 @@ namespace // private } - - - CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_GETVALUE_FUNCTION_T* aCtrlGetValueFunctionTable, size_t aTableSize, sal_Int16 aCtrlAction ) { @@ -138,9 +130,6 @@ namespace // private } - - - inline _ENTRY SAL_CALL GetCtrlClassSetValueFunctionTable( CTRL_CLASS aCtrlClass ) { @@ -148,9 +137,6 @@ namespace // private } - - - inline _ENTRY SAL_CALL GetCtrlClassGetValueFunctionTable( CTRL_CLASS aCtrlClass ) { @@ -174,9 +160,6 @@ namespace // private }; // end namespace - - - CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction ) { _ENTRY aEntry = @@ -189,9 +172,6 @@ CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass } - - - CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction ) { _ENTRY aEntry = @@ -204,9 +184,6 @@ CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass } - - - CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl ) { CTRL_CLASS aCtrlClass = UNKNOWN; @@ -235,9 +212,6 @@ CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl ) } - - - int SAL_CALL CommonFilePickerCtrlIdToWinFileOpenCtrlId( sal_Int16 aControlId ) { if ( aControlId < 0 || aControlId > SIZE_WINDOWS_FILEOPEN_CTRL_IDS ) diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx index c68f9a842985..4dc0e5aa8bea 100644 --- a/fpicker/source/win32/filepicker/controlcommand.cxx +++ b/fpicker/source/win32/filepicker/controlcommand.cxx @@ -32,17 +32,11 @@ CControlCommand::CControlCommand( sal_Int16 aControlId ) : } - - - CControlCommand::~CControlCommand( ) { } - - - CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandRequest* pRequest ) { // if the command does not support handleRequest, it should at least @@ -68,37 +62,24 @@ CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandR } - - - CControlCommand* SAL_CALL CControlCommand::getNextCommand( ) const { return m_NextCommand; } - - - void SAL_CALL CControlCommand::setNextCommand( CControlCommand* nextCommand ) { m_NextCommand = nextCommand; } - - - sal_Int16 SAL_CALL CControlCommand::getControlId( ) const { return m_aControlId; } - - - - CValueControlCommand::CValueControlCommand( sal_Int16 aControlId, sal_Int16 aControlAction, @@ -110,9 +91,6 @@ CValueControlCommand::CValueControlCommand( } - - - void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState ) { OSL_ENSURE( aFilePickerState, "empty reference" ); @@ -124,9 +102,6 @@ void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState ) } - - - CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCommandRequest* aRequest ) { CValueControlCommandRequest* value_request = @@ -158,28 +133,18 @@ CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCom } - - - sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const { return m_aControlAction; } - - - css::uno::Any SAL_CALL CValueControlCommand::getValue( ) const { return m_aValue; } - - - - CLabelControlCommand::CLabelControlCommand( sal_Int16 aControlId, const OUString& aLabel ) : @@ -189,9 +154,6 @@ CLabelControlCommand::CLabelControlCommand( } - - - void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState ) { OSL_ENSURE( aFilePickerState, "empty reference" ); @@ -200,9 +162,6 @@ void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState ) } - - - CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCommandRequest* aRequest ) { OSL_ENSURE( aRequest, "invalid parameter" ); @@ -235,18 +194,12 @@ CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCom } - - - OUString SAL_CALL CLabelControlCommand::getLabel( ) const { return m_aLabel; } - - - CEnableControlCommand::CEnableControlCommand( sal_Int16 aControlId, sal_Bool bEnable ) : @@ -256,9 +209,6 @@ CEnableControlCommand::CEnableControlCommand( } - - - void SAL_CALL CEnableControlCommand::exec( CFilePickerState* aFilePickerState ) { OSL_ENSURE( aFilePickerState, "empty reference" ); diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx index c843589c8617..d6c8ea0b5c94 100644 --- a/fpicker/source/win32/filepicker/controlcommand.hxx +++ b/fpicker/source/win32/filepicker/controlcommand.hxx @@ -25,9 +25,6 @@ #include <rtl/ustring.hxx> - - - class CFilePickerState; class CControlCommandRequest; class CControlCommandResult; @@ -66,9 +63,6 @@ private: }; - - - class CValueControlCommand : public CControlCommand { public: @@ -91,9 +85,6 @@ private: }; - - - class CLabelControlCommand : public CControlCommand { public: @@ -112,9 +103,6 @@ private: }; - - - class CEnableControlCommand : public CControlCommand { public: diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx index f62cfd3a35c7..57dd8b2bf5dc 100644 --- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx +++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx @@ -48,9 +48,6 @@ private: }; - - - class CValueControlCommandRequest : public CControlCommandRequest { public: diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx index f32fff6ad79a..e54af5e0aed3 100644 --- a/fpicker/source/win32/filepicker/controlcommandresult.hxx +++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx @@ -50,9 +50,6 @@ private: }; - - - class CValueCommandResult : public CControlCommandResult { public: @@ -72,9 +69,6 @@ private: }; - - - class CLabelCommandResult : public CControlCommandResult { public: diff --git a/fpicker/source/win32/filepicker/customcontrol.cxx b/fpicker/source/win32/filepicker/customcontrol.cxx index 3acba156b608..1e57e63d4b04 100644 --- a/fpicker/source/win32/filepicker/customcontrol.cxx +++ b/fpicker/source/win32/filepicker/customcontrol.cxx @@ -20,35 +20,23 @@ #include "customcontrol.hxx" - - - CCustomControl::~CCustomControl() { } - - - void SAL_CALL CCustomControl::AddControl(CCustomControl*) { // will be implemented by custom control containers } - - - void SAL_CALL CCustomControl::RemoveControl(CCustomControl*) { // will be implemented by custom control containers } - - - void SAL_CALL CCustomControl::RemoveAllControls() { // will be implemented by custom control containers diff --git a/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx index e209172a18ea..a85ab928c8d4 100644 --- a/fpicker/source/win32/filepicker/customcontrol.hxx +++ b/fpicker/source/win32/filepicker/customcontrol.hxx @@ -31,9 +31,6 @@ #endif - - - class CCustomControl { public: diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx index 3ec33606134e..a02252f3e9a5 100644 --- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx +++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx @@ -25,9 +25,6 @@ #include <osl/diagnose.h> - - - CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle, HWND aParentHandle) { OSL_PRECOND(IsWindow(aControlHandle),"Invalid control handle"); @@ -67,9 +64,6 @@ CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle, } - - - CCustomControl* CCustomControlFactory::CreateCustomControlContainer() { return new CCustomControlContainer(); diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx index 5a3861002eab..65d7686c8553 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx @@ -21,9 +21,6 @@ #include <osl/diagnose.h> - - - CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aParentHandle) : m_CustomControlHandle(aControlHandle), m_ParentHandle(aParentHandle) @@ -31,9 +28,6 @@ CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aPa } - - - void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont) { SendMessage( @@ -44,9 +38,6 @@ void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont) } - - - void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle) { OSL_PRECOND(IsWindow(aBuddyHandle),"Invalid buddy window handle"); @@ -80,35 +71,23 @@ void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle) } - - - CDummyCustomControl::CDummyCustomControl(HWND, HWND) { } - - - void SAL_CALL CDummyCustomControl::Align() { // do nothing } - - - void SAL_CALL CDummyCustomControl::SetFont(HFONT) { // do nothing } - - - CStaticCustomControl::CStaticCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { @@ -125,9 +104,6 @@ void SAL_CALL CStaticCustomControl::Align() } - - - CPushButtonCustomControl::CPushButtonCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { @@ -144,9 +120,6 @@ void SAL_CALL CPushButtonCustomControl::Align() } - - - CComboboxCustomControl::CComboboxCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { @@ -163,9 +136,6 @@ void SAL_CALL CComboboxCustomControl::Align() } - - - CCheckboxCustomControl::CCheckboxCustomControl(HWND aControlHandle, HWND aParentHandle) : CDialogCustomControlBase(aControlHandle,aParentHandle) { diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx index a9f2d1a50a22..e6dcb732c184 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx @@ -31,9 +31,6 @@ #endif - - - class CDummyCustomControl : public CCustomControl { public: @@ -44,9 +41,6 @@ public: }; - - - class CDialogCustomControlBase : public CCustomControl { protected: @@ -65,9 +59,6 @@ protected: }; - - - class CStaticCustomControl : public CDialogCustomControlBase { public: @@ -77,9 +68,6 @@ public: }; - - - class CPushButtonCustomControl : public CDialogCustomControlBase { public: @@ -89,9 +77,6 @@ public: }; - - - class CComboboxCustomControl : public CDialogCustomControlBase { public: @@ -101,9 +86,6 @@ public: }; - - - class CCheckboxCustomControl : public CDialogCustomControlBase { public: diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index 0d2ebf4ee9a7..f8ea295d51ca 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -29,18 +29,12 @@ #include <string> - - - using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Any; using ::com::sun::star::lang::IllegalArgumentException; - - - namespace /* private */ { const LPCTSTR CURRENT_INSTANCE = TEXT("CurrInst"); @@ -57,9 +51,6 @@ ATOM CDIBPreview::s_ClassAtom = 0; sal_Int32 CDIBPreview::s_RegisterDibPreviewWndCount = 0; - - - CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) : m_Instance(instance) { @@ -93,9 +84,6 @@ CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) : } - - - CDIBPreview::~CDIBPreview( ) { // remember: we don't have to destroy the @@ -107,9 +95,6 @@ CDIBPreview::~CDIBPreview( ) } - - - sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException) { HDC hdc = GetDC(m_Hwnd); @@ -122,9 +107,6 @@ sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException) } - - - sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException) { RECT rect; @@ -139,9 +121,6 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException) } - - - sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException) { RECT rect; @@ -156,9 +135,6 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException) } - - - void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage) throw (IllegalArgumentException, RuntimeException) { @@ -179,9 +155,6 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage) } - - - sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeException) { PreviewBase::setShowState(bShowState); @@ -190,27 +163,18 @@ sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeE } - - - sal_Bool SAL_CALL CDIBPreview::getShowState() throw (RuntimeException) { return (sal_Bool)IsWindowVisible(m_Hwnd); } - - - HWND SAL_CALL CDIBPreview::getWindowHandle() const { return m_Hwnd; } - - - void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) { osl::MutexGuard aGuard(m_PaintLock); @@ -294,9 +258,6 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) } - - - LRESULT CALLBACK CDIBPreview::WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -362,9 +323,6 @@ LRESULT CALLBACK CDIBPreview::WndProc( } - - - ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass() { osl::MutexGuard aGuard( s_Mutex ); @@ -405,9 +363,6 @@ ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass() } - - - void SAL_CALL CDIBPreview::UnregisterDibPreviewWindowClass() { osl::MutexGuard aGuard( s_Mutex ); diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.cxx b/fpicker/source/win32/filepicker/filepickereventnotification.cxx index e62a3c4beb03..a93fa5a0ce76 100644 --- a/fpicker/source/win32/filepicker/filepickereventnotification.cxx +++ b/fpicker/source/win32/filepicker/filepickereventnotification.cxx @@ -38,9 +38,6 @@ CFilePickerEventNotification::CFilePickerEventNotification(EventListenerMethod_t } - - - void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInterface > xListener ) { Reference<XFilePickerListener> xFilePickerListener(xListener,UNO_QUERY); @@ -49,10 +46,6 @@ void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInt } - - - - // A FilePicker event with parameter diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index 91e3e5ece9b0..54863f2175f2 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -35,8 +35,6 @@ #include "../misc/WinImplHelper.hxx" - - using com::sun::star::uno::Any; using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; @@ -47,9 +45,6 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::ListboxControlActions; - - - const sal_Int32 MAX_LABEL = 256; const sal_Int16 LISTBOX_LABEL_OFFSET = 100; @@ -62,27 +57,18 @@ CFilePickerState::~CFilePickerState( ) } - - - CNonExecuteFilePickerState::CNonExecuteFilePickerState( ) : m_FirstControlCommand( NULL ) { } - - - CNonExecuteFilePickerState::~CNonExecuteFilePickerState( ) { reset( ); } - - - void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue ) { CValueControlCommand* value_command = new CValueControlCommand( @@ -92,9 +78,6 @@ void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_In } - - - Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) { CValueControlCommandRequest value_request( aControlId, aControlAction ); @@ -135,9 +118,6 @@ Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int } - - - void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable ) { CEnableControlCommand* enable_command = new CEnableControlCommand( @@ -147,9 +127,6 @@ void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, s } - - - void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel ) { CLabelControlCommand* label_command = new CLabelControlCommand( @@ -159,9 +136,6 @@ void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const } - - - OUString SAL_CALL CNonExecuteFilePickerState::getLabel( sal_Int16 aControlId ) { CControlCommandRequest label_request( aControlId ); @@ -203,8 +177,6 @@ OUString MatchFixBrokenPath(const OUString& path) } - - static OUString trimTrailingSpaces(const OUString& rString) { OUString aResult(rString); @@ -281,9 +253,6 @@ Sequence< OUString > SAL_CALL CNonExecuteFilePickerState::getFiles( CFileOpenDia } - - - OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) { OSL_PRECOND( aFileOpenDialog, "invalid parameter" ); @@ -300,9 +269,6 @@ OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDial } - - - void SAL_CALL CNonExecuteFilePickerState::reset( ) { CControlCommand* nextCommand; @@ -319,9 +285,6 @@ void SAL_CALL CNonExecuteFilePickerState::reset( ) } - - - CControlCommand* SAL_CALL CNonExecuteFilePickerState::getControlCommand( ) const { return m_FirstControlCommand; @@ -353,20 +316,12 @@ void SAL_CALL CNonExecuteFilePickerState::addControlCommand( CControlCommand* aC } - - - - - CExecuteFilePickerState::CExecuteFilePickerState( HWND hwndDlg ) : m_hwndDlg( hwndDlg ) { } - - - void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue ) { // we do not support SET_HELP_URL/GET_HELP_URL @@ -406,9 +361,6 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 } - - - Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) { // we do not support SET_HELP_URL/GET_HELP_URL @@ -445,9 +397,6 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 } - - - void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable ) { HWND hwndCtrl = GetHwndDlgItem( aControlId ); @@ -458,9 +407,6 @@ void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_ } - - - void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel ) { HWND hwndCtrl = GetHwndDlgItem( aControlId ); @@ -478,9 +424,6 @@ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUS } - - - OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) { HWND hwndCtrl = GetHwndDlgItem( aControlId ); @@ -503,9 +446,6 @@ OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) } - - - Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog* aFileOpenDialog ) { SAL_WARN_IF( !aFileOpenDialog, "fpicker", "invalid parameter" ); @@ -539,9 +479,6 @@ Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog } - - - OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) { SAL_WARN_IF( !aFileOpenDialog, "fpicker", "invalid parameter" ); @@ -558,9 +495,6 @@ OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* } - - - void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand* firstControlCommand ) { CControlCommand* aControlCommand = firstControlCommand; @@ -573,9 +507,6 @@ void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand* } - - - void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFilePickerState* aNonExecFilePickerState ) { OSL_ENSURE( hwndControl && aNonExecFilePickerState, "invalid parameters" ); @@ -631,18 +562,12 @@ void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFil } - - - void SAL_CALL CExecuteFilePickerState::setHwnd( HWND hwndDlg ) { m_hwndDlg = hwndDlg; } - - - inline sal_Bool SAL_CALL CExecuteFilePickerState::IsListboxControl( HWND hwndControl ) const { OSL_PRECOND( IsWindow( hwndControl ), "invalid parameter" ); @@ -665,9 +590,6 @@ inline sal_Int16 SAL_CALL CExecuteFilePickerState::ListboxIdToListboxLabelId( sa } - - - inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aControlId ) const { sal_Int16 aLabelId = ListboxIdToListboxLabelId( aControlId ); @@ -679,9 +601,6 @@ inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aCo } - - - HWND SAL_CALL CExecuteFilePickerState::GetHwndDlgItem( sal_Int16 aControlId, sal_Bool bIncludeStdCtrls ) const { OSL_ENSURE( IsWindow( m_hwndDlg ), "no valid parent window set before" ); diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx index fbf15f62747c..d125a3efd162 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.hxx +++ b/fpicker/source/win32/filepicker/filepickerstate.hxx @@ -36,8 +36,6 @@ #endif - - class CControlCommand; class CFileOpenDialog; diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx index e8868b699aae..7d28f605b8c0 100644 --- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx +++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx @@ -109,9 +109,6 @@ namespace /* private */ }; - - - struct GetFileNameParam { GetFileNameParam(bool bOpen, LPOPENFILENAME lpofn) : @@ -128,9 +125,6 @@ namespace /* private */ }; - - - unsigned __stdcall ThreadProc(void* pParam) { osl_setThreadName("fpicker GetOpenFileName"); @@ -200,19 +194,12 @@ namespace /* private */ } // namespace private - - - - CGetFileNameWrapper::CGetFileNameWrapper() : m_ExtendedDialogError(0) { } - - - bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn) { OSL_PRECOND(lpofn,"invalid parameter"); @@ -241,9 +228,6 @@ bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn) } - - - bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn) { OSL_PRECOND(lpofn,"invalid parameter"); @@ -267,9 +251,6 @@ bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn) } - - - int CGetFileNameWrapper::commDlgExtendedError( ) { return m_ExtendedDialogError; diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx index 237433a9a6eb..3eedd9356e53 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.cxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx @@ -22,15 +22,9 @@ #include <osl/diagnose.h> - - - using osl::Mutex; - - - namespace /* private */ { @@ -63,9 +57,6 @@ ATOM CHelpPopupWindow::s_ClassAtom = 0; sal_Int32 CHelpPopupWindow::s_RegisterWndClassCount = 0; - - - CHelpPopupWindow::CHelpPopupWindow( HINSTANCE hInstance, HWND hwndParent ) : @@ -89,9 +80,6 @@ CHelpPopupWindow::CHelpPopupWindow( } - - - CHelpPopupWindow::~CHelpPopupWindow( ) { // remember: we don't have to destroy the @@ -106,18 +94,12 @@ CHelpPopupWindow::~CHelpPopupWindow( ) } - - - void SAL_CALL CHelpPopupWindow::setText( const OUString& aHelpText ) { m_HelpText = aHelpText; } - - - void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y ) { OSL_ENSURE( NULL == m_hwnd, "method should not be called twice in sequence" ); @@ -154,9 +136,6 @@ void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y ) } - - - HWND SAL_CALL CHelpPopupWindow::setParent( HWND hwndNewParent ) { HWND oldParent = m_hwndParent; @@ -216,9 +195,6 @@ void SAL_CALL CHelpPopupWindow::calcWindowRect( LPRECT lprect ) } - - - void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32* cy_new ) { OSL_ASSERT( cx_new && cy_new ); @@ -241,9 +217,6 @@ void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32* } - - - void SAL_CALL CHelpPopupWindow::adjustWindowPos( sal_Int32 x, sal_Int32 y, sal_Int32 cx, sal_Int32 cy ) { @@ -290,9 +263,6 @@ void SAL_CALL CHelpPopupWindow::adjustWindowPos( } - - - void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc ) { RECT rc; @@ -410,18 +380,12 @@ void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc ) } - - - void SAL_CALL CHelpPopupWindow::onNcDestroy() { m_hwnd = NULL; } - - - void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd ) { m_hwnd = hwnd; @@ -449,9 +413,6 @@ void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd ) } - - - LRESULT CALLBACK CHelpPopupWindow::WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { @@ -523,9 +484,6 @@ LRESULT CALLBACK CHelpPopupWindow::WndProc( } - - - ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); @@ -563,9 +521,6 @@ ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( ) } - - - void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx index 1180d8856f29..967aac00495b 100644 --- a/fpicker/source/win32/filepicker/previewadapter.cxx +++ b/fpicker/source/win32/filepicker/previewadapter.cxx @@ -30,9 +30,6 @@ #include <stdexcept> - - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -98,9 +95,6 @@ private: }; - - - CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) : m_Instance(instance), m_Preview(new PreviewBase()), // create dummy preview (NULL-Object pattern) @@ -110,44 +104,29 @@ CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) : } - - - CPreviewAdapterImpl::~CPreviewAdapterImpl() { } - - - sal_Int32 SAL_CALL CPreviewAdapterImpl::getTargetColorDepth() { return m_Preview->getTargetColorDepth(); } - - - sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableWidth() { return m_Preview->getAvailableWidth(); } - - - sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableHeight() { return m_Preview->getAvailableHeight(); } - - - void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& aImage ) throw (IllegalArgumentException,RuntimeException) { @@ -155,9 +134,6 @@ void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& } - - - sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState ) { sal_Bool bRet = m_Preview->setShowState(bShowState); @@ -166,18 +142,12 @@ sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState ) } - - - sal_Bool SAL_CALL CPreviewAdapterImpl::getShowState() { return m_Preview->getShowState(); } - - - void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent) { OSL_PRECOND(IsWindow(parent),"Invalid FileDialog handle"); @@ -187,18 +157,12 @@ void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent) } - - - HWND SAL_CALL CPreviewAdapterImpl::getParent() { return m_FileDialog; } - - - void SAL_CALL CPreviewAdapterImpl::calcRightMargin() { // Calculate the right reference margin @@ -228,34 +192,22 @@ void SAL_CALL CPreviewAdapterImpl::calcRightMargin() } - - - void SAL_CALL CPreviewAdapterImpl::notifyParentShow(sal_Bool) { } - - - void SAL_CALL CPreviewAdapterImpl::notifyParentSizeChanged() { rearrangeLayout(); } - - - void SAL_CALL CPreviewAdapterImpl::notifyParentWindowPosChanged() { } - - - void SAL_CALL CPreviewAdapterImpl::rearrangeLayout() { // try to get a handle to the filelistbox @@ -348,9 +300,6 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout() } - - - void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_error) { sal_Bool bShowState = m_Preview->getImaginaryShowState(); @@ -370,9 +319,6 @@ void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_ } - - - HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const { // try to get a handle to the filelistbox @@ -390,15 +336,10 @@ HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const } - - - - // Implementation for Windows 95/NT/ME/2000/XP // because: - class CWin95NTPreviewAdapterImpl : public CPreviewAdapterImpl { public: @@ -408,18 +349,12 @@ public: }; - - - CWin95NTPreviewAdapterImpl::CWin95NTPreviewAdapterImpl(HINSTANCE instance) : CPreviewAdapterImpl(instance) { } - - - void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow) { try @@ -436,10 +371,6 @@ void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow) } - - - - // ctor @@ -449,17 +380,11 @@ CPreviewAdapter::CPreviewAdapter(HINSTANCE instance) } - - - CPreviewAdapter::~CPreviewAdapter() { } - - - Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats() { css::uno::Sequence<sal_Int16> imgFormats(1); @@ -468,36 +393,24 @@ Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats() } - - - sal_Int32 SAL_CALL CPreviewAdapter::getTargetColorDepth() { return m_pImpl->getTargetColorDepth(); } - - - sal_Int32 SAL_CALL CPreviewAdapter::getAvailableWidth() { return m_pImpl->getAvailableWidth(); } - - - sal_Int32 SAL_CALL CPreviewAdapter::getAvailableHeight() { return m_pImpl->getAvailableHeight(); } - - - void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aImage ) throw (IllegalArgumentException, RuntimeException) { @@ -505,54 +418,36 @@ void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aIma } - - - sal_Bool SAL_CALL CPreviewAdapter::setShowState( sal_Bool bShowState ) { return m_pImpl->setShowState(bShowState); } - - - sal_Bool SAL_CALL CPreviewAdapter::getShowState() { return m_pImpl->getShowState(); } - - - void SAL_CALL CPreviewAdapter::setParent(HWND parent) { m_pImpl->setParent(parent); } - - - void SAL_CALL CPreviewAdapter::notifyParentShow(bool bShow) { m_pImpl->notifyParentShow(bShow); } - - - void SAL_CALL CPreviewAdapter::notifyParentSizeChanged() { m_pImpl->notifyParentSizeChanged(); } - - - void SAL_CALL CPreviewAdapter::notifyParentWindowPosChanged() { m_pImpl->notifyParentWindowPosChanged(); diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx index 1e8ecea46114..00543c97ceb4 100644 --- a/fpicker/source/win32/filepicker/previewbase.cxx +++ b/fpicker/source/win32/filepicker/previewbase.cxx @@ -25,10 +25,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; - - - - PreviewBase::PreviewBase() : m_ImageFormat(css::ui::dialogs::FilePreviewImageFormats::BITMAP), m_bShowState(sal_False) @@ -36,44 +32,29 @@ PreviewBase::PreviewBase() : } - - - PreviewBase::~PreviewBase() { } - - - sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth() throw (RuntimeException) { return 0; } - - - sal_Int32 SAL_CALL PreviewBase::getAvailableWidth() throw (RuntimeException) { return 0; } - - - sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException) { return 0; } - - - void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const css::uno::Any& aImage ) throw (IllegalArgumentException, RuntimeException) { @@ -91,9 +72,6 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const css::uno::Any } - - - void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,css::uno::Any& aImage) { aImageFormat = m_ImageFormat; @@ -101,9 +79,6 @@ void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,css::uno::Any& aImag } - - - sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (RuntimeException) { m_bShowState = bShowState; @@ -111,27 +86,18 @@ sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (Runtim } - - - sal_Bool SAL_CALL PreviewBase::getShowState() throw (RuntimeException) { return sal_False; } - - - sal_Bool SAL_CALL PreviewBase::getImaginaryShowState() const { return m_bShowState; } - - - HWND SAL_CALL PreviewBase::getWindowHandle() const { return 0; diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index a33f7ccad3ca..3afde9c62aed 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -233,7 +233,6 @@ void SAL_CALL FilePickerListener::dialogSizeChanged( ) // main - int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) { printf("Starting test of FPS-Service\n"); diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index 48e35296c692..d9666ce8f37e 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -57,9 +57,6 @@ namespace } - - - CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceMgr ) : m_xServiceMgr( xServiceMgr ) { @@ -67,9 +64,6 @@ CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceM } - - - void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeException ) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); @@ -78,9 +72,6 @@ void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeEx } - - - void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory ) throw( IllegalArgumentException, RuntimeException ) { @@ -90,9 +81,6 @@ void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory ) } - - - OUString SAL_CALL CFolderPicker::getDisplayDirectory( ) throw( RuntimeException ) { @@ -102,9 +90,6 @@ OUString SAL_CALL CFolderPicker::getDisplayDirectory( ) } - - - OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException ) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); @@ -113,9 +98,6 @@ OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException ) } - - - void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) throw( RuntimeException ) { OSL_ASSERT( m_pFolderPickerImpl.get( ) ); @@ -124,9 +106,6 @@ void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) thro } - - - sal_Int16 SAL_CALL CFolderPicker::execute( ) throw( RuntimeException ) { diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 4be8a3ee1dd0..78b144bdbf5a 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -224,9 +224,6 @@ CMtaFolderPicker::~CMtaFolderPicker( ) } - - - sal_Bool CMtaFolderPicker::browseForFolder( ) { sal_Bool bRet = sal_False; @@ -308,54 +305,36 @@ sal_Bool CMtaFolderPicker::browseForFolder( ) } - - - void SAL_CALL CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory ) { m_displayDir = aDirectory; } - - - OUString SAL_CALL CMtaFolderPicker::getDisplayDirectory( ) { return m_displayDir; } - - - OUString SAL_CALL CMtaFolderPicker::getDirectory( ) { return m_SelectedDir; } - - - void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription ) { m_Description = aDescription; } - - - void SAL_CALL CMtaFolderPicker::setTitle( const OUString& aTitle ) { m_dialogTitle = aTitle; } - - - OUString SAL_CALL CMtaFolderPicker::getTitle( ) { return m_dialogTitle; @@ -380,9 +359,6 @@ void SAL_CALL CMtaFolderPicker::cancel( ) } - - - sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) { sal_Bool bRet; @@ -408,9 +384,6 @@ sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) } - - - void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) { sal::systools::COMReference<IMalloc> pIMalloc; @@ -423,9 +396,6 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) } - - - LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory ) { // parameter checking @@ -452,9 +422,6 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a } - - - OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList ) { OUString path; @@ -470,9 +437,6 @@ OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemI } - - - void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -485,9 +449,6 @@ void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable ) } - - - void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -500,9 +461,6 @@ void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) } - - - void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -515,9 +473,6 @@ void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) } - - - void SAL_CALL CMtaFolderPicker::onInitialized( ) { LPITEMIDLIST lpiidDisplayDir = getItemIdListFromPath( m_displayDir ); @@ -535,9 +490,6 @@ void SAL_CALL CMtaFolderPicker::onInitialized( ) } - - - sal_uInt32 CMtaFolderPicker::onValidateFailed() { // to be overwritten by subclasses @@ -545,9 +497,6 @@ sal_uInt32 CMtaFolderPicker::onValidateFailed() } - - - int CALLBACK CMtaFolderPicker::FolderPickerCallback( HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData ) { CMtaFolderPicker* pImpl = reinterpret_cast< CMtaFolderPicker* >( lpData ); @@ -656,9 +605,6 @@ LRESULT CALLBACK CMtaFolderPicker::StaWndProc( HWND hWnd, UINT uMsg, WPARAM wPar } - - - sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( ) { bool bIsWnd = false; @@ -687,9 +633,6 @@ sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( ) } - - - unsigned int CMtaFolderPicker::run( ) { OSL_ASSERT( m_hEvtThrdReady ); @@ -731,9 +674,6 @@ unsigned int CMtaFolderPicker::run( ) } - - - unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) { osl_setThreadName("fpicker CMtaFolderPicker::run()"); @@ -754,9 +694,6 @@ unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) } - - - ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); @@ -794,9 +731,6 @@ ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) } - - - void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 481fc1f82354..7bfc506a2dc8 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -38,9 +38,6 @@ using namespace com::sun::star::ui::dialogs; using osl::FileBase; - - - const OUString BACKSLASH( "\\" ); @@ -113,9 +110,6 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( ) } - - - OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException ) { OUString sysDir = CMtaFolderPicker::getDirectory( ); @@ -128,9 +122,6 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException } - - - sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException ) { return m_nLastDlgResult = CMtaFolderPicker::browseForFolder( ) ? @@ -139,9 +130,6 @@ sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException ) } - - - void CWinFolderPickerImpl::onSelChanged( const OUString& aNewPath ) { setStatusText( aNewPath ); diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx index ae561b4487d4..e3d142b0b983 100644 --- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx +++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx @@ -61,7 +61,6 @@ Reference< XMultiServiceFactory > g_xFactory; // main - int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/ ) { CoInitializeEx( NULL, COINIT_MULTITHREADED ); diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index 28957e17eed5..84c51419d919 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -38,9 +38,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; - - - const OUString TILDE( "~" ); const sal_Unicode TILDE_SIGN = L'~'; const OUString AMPERSAND( "&" ); @@ -60,7 +57,6 @@ const sal_Unicode AMPERSAND_SIGN = L'&'; // Windows ME VER_PLATFORM_WIN32_WINDOWS 4 90 - // determine if we are running under Vista or newer OS @@ -88,9 +84,6 @@ bool SAL_CALL IsWindowsVistaOrNewer() } - - - void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString ) { LRESULT rc = SendMessageW( @@ -100,9 +93,6 @@ void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString ) } - - - OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -135,9 +125,6 @@ OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition ) } - - - void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -157,9 +144,6 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt } - - - void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -183,9 +167,6 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< } - - - void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -215,9 +196,6 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc } - - - void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInterface >&, sal_Int16 ) throw( IllegalArgumentException ) { @@ -235,9 +213,6 @@ void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInter } - - - void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) { @@ -271,9 +246,6 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref } - - - Any SAL_CALL ListboxGetItems( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -299,9 +271,6 @@ Any SAL_CALL ListboxGetItems( HWND hwnd ) } - - - Any SAL_CALL ListboxGetSelectedItem( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -315,9 +284,6 @@ Any SAL_CALL ListboxGetSelectedItem( HWND hwnd ) } - - - Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -331,9 +297,6 @@ Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd ) } - - - Any SAL_CALL CheckboxGetState( HWND hwnd ) { OSL_ASSERT( IsWindow( hwnd ) ); @@ -346,9 +309,6 @@ Any SAL_CALL CheckboxGetState( HWND hwnd ) } - - - void SAL_CALL CheckboxSetState( HWND hwnd, const css::uno::Any& aState, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) throw( IllegalArgumentException ) @@ -368,9 +328,6 @@ void SAL_CALL CheckboxSetState( } - - - sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ) { if ( !pStr ) @@ -388,9 +345,6 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ) } - - - void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar, OUStringBuffer& aBuffer ) { OSL_ASSERT( aLabel.getLength( ) ); diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 2c00fc2244dc..55abde0239e6 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -37,9 +37,6 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; - - - #define FOLDERPICKER_TITLE 500 #define FOLDER_PICKER_DEF_DESCRIPTION 501 @@ -72,9 +69,6 @@ _Entry CtrlIdToResIdTable[] = { const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); - - - sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) { sal_Int16 aResId = -1; @@ -92,17 +86,11 @@ sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) } - - - class CResourceProvider_Impl { public: - - - CResourceProvider_Impl( ) { const SolarMutexGuard aGuard; @@ -111,18 +99,12 @@ public: } - - - ~CResourceProvider_Impl( ) { delete m_ResMgr; } - - - OUString getResString( sal_Int16 aId ) { OUString aResOUString; @@ -149,27 +131,18 @@ public: }; - - - CResourceProvider::CResourceProvider( ) : m_pImpl( new CResourceProvider_Impl() ) { } - - - CResourceProvider::~CResourceProvider( ) { delete m_pImpl; } - - - OUString CResourceProvider::getResString( sal_Int16 aId ) { return m_pImpl->getResString( aId ); diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx index b35c194d035a..fd2ee7c1d5a2 100644 --- a/fpicker/test/svdem.cxx +++ b/fpicker/test/svdem.cxx @@ -79,7 +79,6 @@ SAL_IMPLEMENT_MAIN() } - class MyWin : public WorkWindow { public: @@ -101,7 +100,6 @@ private: }; - void Main() { MyWin aMainWin( NULL, WB_APP | WB_STDWORK ); @@ -112,7 +110,6 @@ void Main() } - MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :WorkWindow( pParent, nWinStyle ) ,aOKBtn(this) @@ -123,56 +120,48 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) } - void MyWin::MouseMove( const MouseEvent& rMEvt ) { WorkWindow::MouseMove( rMEvt ); } - void MyWin::MouseButtonDown( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonDown( rMEvt ); } - void MyWin::MouseButtonUp( const MouseEvent& rMEvt ) { WorkWindow::MouseButtonUp( rMEvt ); } - void MyWin::KeyInput( const KeyEvent& rKEvt ) { WorkWindow::KeyInput( rKEvt ); } - void MyWin::KeyUp( const KeyEvent& rKEvt ) { WorkWindow::KeyUp( rKEvt ); } - void MyWin::Paint( const Rectangle& rRect ) { WorkWindow::Paint( rRect ); } - void MyWin::Resize() { WorkWindow::Resize(); } - IMPL_LINK_TYPED( MyWin, Test, PushButton*, pBtn, void ) { printf("Test\n"); diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 9e93ae342398..87c95ad04174 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -42,9 +42,6 @@ class WindowHelper public: - - - static bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { // even child frame containing top level windows (e.g. query designer of database) will be closed diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx index e1c485583ab8..f8b1f95952e5 100644 --- a/helpcompiler/source/BasCodeTagger.cxx +++ b/helpcompiler/source/BasCodeTagger.cxx @@ -49,8 +49,6 @@ bool LibXmlTreeWalker::end() } - - BasicCodeTagger::BasicCodeTagger( xmlDocPtr rootDoc ): m_Highlighter(HIGHLIGHT_BASIC) { diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx index b72e4040c23d..7542b0dd1ae4 100644 --- a/hwpfilter/source/grammar.cxx +++ b/hwpfilter/source/grammar.cxx @@ -65,7 +65,6 @@ typedef union { #endif - #define YYFINAL 102 #define YYFLAG -32768 #define YYNTBASE 43 diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx index 7b474bdba72d..a576fef6fc8a 100644 --- a/hwpfilter/source/hpara.cxx +++ b/hwpfilter/source/hpara.cxx @@ -202,8 +202,6 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag) } - - CharShape *HWPPara::GetCharShape(int pos) { if (contain_cshape == 0) @@ -212,8 +210,6 @@ CharShape *HWPPara::GetCharShape(int pos) } - - HBox *HWPPara::readHBox(HWPFile & hwpf) { hchar hh; diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx index cc7734cec83d..6a67d23818de 100644 --- a/hwpfilter/source/hstyle.cxx +++ b/hwpfilter/source/hstyle.cxx @@ -53,8 +53,6 @@ HWPStyle::~HWPStyle() } - - char *HWPStyle::GetName(int n) const { if (!(n >= 0 && n < nstyles)) diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx index a3e6baee5ed4..e7518ab38c25 100644 --- a/hwpfilter/source/lexer.cxx +++ b/hwpfilter/source/lexer.cxx @@ -2045,7 +2045,6 @@ char msg[]; } - /* Internal utility routines. */ #ifndef yytext_ptr diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx index 99dcc7f0ab21..e215716b8670 100644 --- a/hwpfilter/source/list.hxx +++ b/hwpfilter/source/list.hxx @@ -71,8 +71,6 @@ public: }; - - // IMPLEMENTATION // (the implementation of template classes must be accessible to using diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx index b9a31ba8419c..9f5563a2d70a 100644 --- a/hwpfilter/source/mzstring.cxx +++ b/hwpfilter/source/mzstring.cxx @@ -248,7 +248,6 @@ void MzString::replace(int pos, char ch) } - // Private Methods. diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx index fb91b090222b..cf0e5f4854cc 100644 --- a/i18nlangtag/source/isolang/inunx.cxx +++ b/i18nlangtag/source/isolang/inunx.cxx @@ -35,12 +35,10 @@ #include "i18nlangtag/mslangid.hxx" - static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW; static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW; - // Get locale of category LC_CTYPE of environment variables static const sal_Char* getLangFromEnvironment() { @@ -59,7 +57,6 @@ static const sal_Char* getLangFromEnvironment() } - // Get locale of category LC_MESSAGES of environment variables static const sal_Char* getUILangFromEnvironment() { @@ -80,7 +77,6 @@ static const sal_Char* getUILangFromEnvironment() } - typedef const sal_Char * (*getLangFromEnv)(); static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage, @@ -122,7 +118,6 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage, } - LanguageType MsLangId::getPlatformSystemLanguage() { getPlatformSystemLanguageImpl( nImplSystemLanguage, &getLangFromEnvironment); @@ -130,7 +125,6 @@ LanguageType MsLangId::getPlatformSystemLanguage() } - LanguageType MsLangId::getPlatformSystemUILanguage() { getPlatformSystemLanguageImpl( nImplSystemUILanguage, &getUILangFromEnvironment); diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx index 158dd8bdf627..8521e5469924 100644 --- a/i18nlangtag/source/isolang/inwnt.cxx +++ b/i18nlangtag/source/isolang/inwnt.cxx @@ -37,7 +37,6 @@ static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW; static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW; - static LanguageType GetSVLang( LANGID nWinLangId ) { // No Translation, we work with the original MS code without the SORT_ID. @@ -47,7 +46,6 @@ static LanguageType GetSVLang( LANGID nWinLangId ) } - typedef LANGID (WINAPI *getLangFromEnv)(); static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage, @@ -81,7 +79,6 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage, } - LanguageType MsLangId::getPlatformSystemLanguage() { getPlatformSystemLanguageImpl( nImplSystemLanguage, @@ -90,7 +87,6 @@ LanguageType MsLangId::getPlatformSystemLanguage() } - LanguageType MsLangId::getPlatformSystemUILanguage() { // TODO: this could be distinguished, #if(WINVER >= 0x0500) diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 426f4a395af5..f1a141ded3ec 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; - static const LanguageType kSAME = 0xffff; namespace { @@ -125,7 +124,6 @@ struct IsoLangOtherEntry }; - // Entries for languages are lower case, for countries upper case, as // recommended by rfc5646 (obsoletes rfc4646 (obsoletes rfc3066 (obsoletes // rfc1766))). convertIsoNamesToLanguage(), convertLocaleToLanguageImpl() @@ -803,7 +801,6 @@ css::lang::Locale Bcp47CountryEntry::getLocale() const } - // In this table are the countries which should mapped to a specific // english language static IsoLangEngEntry const aImplIsoLangEngEntries[] = @@ -872,7 +869,6 @@ static IsoLangEngEntry const aImplIsoLangEngEntries[] = }; - static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries[] = { { LANGUAGE_NORWEGIAN_BOKMAL, "no", "BOK" }, // registered subtags for "no" in rfc1766 @@ -885,7 +881,6 @@ static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries[] = }; - // in this table are only names to find the best language static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries2[] = { @@ -896,7 +891,6 @@ static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries2[] = }; - // in this table are only names to find the best language static IsoLangOtherEntry const aImplOtherEntries[] = { @@ -922,7 +916,6 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] = }; - // static void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang, css::lang::Locale & rLocale, bool bIgnoreOverride ) @@ -1006,7 +999,6 @@ Label_Override_Lang_Locale: } - // static css::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageCountryEntry * pEntry ) { @@ -1154,7 +1146,6 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale( } - // static LanguageType MsLangId::Conversion::convertPrivateUseToLanguage( const OUString& rPriv ) { @@ -1357,7 +1348,6 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL } - // static LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLang, const OString& rCountry ) @@ -1368,7 +1358,6 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLa } - struct IsoLangGLIBCModifiersEntry { LanguageType mnLang; diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 9d0b29589263..782a7e247dbb 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -2016,8 +2016,6 @@ bool LanguageTag::isValidBcp47() const } - - LanguageTag & LanguageTag::makeFallback() { if (!mbIsFallback) diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx index d3ee50ae027c..b9bb93b1497a 100644 --- a/i18npool/inc/calendar_hijri.hxx +++ b/i18npool/inc/calendar_hijri.hxx @@ -22,7 +22,6 @@ #include "calendar_gregorian.hxx" - // class Calendar_hijri diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 87d3b9f697e4..6d6e1c67144f 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -420,7 +420,6 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, s } - sal_Int16 SAL_CALL BreakIteratorImpl::getWordType( const OUString& /*Text*/, sal_Int32 /*nPos*/, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) { diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index 59bbdc47203c..f367a5d50ea1 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -51,10 +51,6 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::io; - - - - /************ * Sequence of bytes -> InputStream ************/ @@ -195,7 +191,6 @@ public: // Error handler public: // ExtendedDocumentHandler - stack<LocaleNode *> currentNode ; LocaleNode * rootNode; @@ -313,9 +308,6 @@ public: }; - - - SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { try { diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index e329589cc7fb..4a5e14782cef 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -65,7 +65,6 @@ NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, } - css::i18n::NumberFormatCode SAL_CALL NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) { @@ -90,7 +89,6 @@ NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const css::lang::L } - css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) { diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 7ba4e5300cd0..243c98cb2662 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -95,7 +95,6 @@ typedef uno::Reference< &implName##_CreateInstance } - using namespace i18n; // At least for iOS it doesn't hurt if we have lots of functions here diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 6e80233fa97c..5263713e7c09 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -477,7 +477,6 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st } - bool TextSearch::IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const { bool bRet = true; @@ -844,7 +843,6 @@ void TextSearch::RESrchPrepare( const css::util::SearchOptions& rOptions) } - static bool lcl_findRegex( RegexMatcher * pRegexMatcher, sal_Int32 nStartPos, UErrorCode & rIcuErr ) { if (!pRegexMatcher->find( nStartPos, rIcuErr)) @@ -984,7 +982,6 @@ SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr, } - // search for words phonetically SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index 7ed3ee9a6150..706f46c7cbf9 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -63,8 +63,6 @@ OneToOneMappingTable_t IandE[] = { }; - - OUString SAL_CALL ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 40be08e8fede..2c01caee568b 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -344,7 +344,6 @@ TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, s } - OUString SAL_CALL TransliterationImpl::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index d9a09182635a..156897d425dd 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -244,7 +244,6 @@ public: }; - #endif // INCLUDED_IDL_INC_LEX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 52956aaca318..aef20abf40df 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -84,7 +84,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** convert color to gray @@ -110,7 +109,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** invert color @@ -138,7 +136,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** convert to alpha based on luminance @@ -170,7 +167,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** replace color @@ -206,7 +202,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** interpolate color @@ -246,7 +241,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** convert color to black and white @@ -281,7 +275,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** gamma correction @@ -318,7 +311,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /** Red, Green, Blue, Luminance and Contrast correction @@ -368,7 +360,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { /// typedef to allow working with shared instances of BColorModifier @@ -416,7 +407,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_COLOR_BCOLORMODIFIER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx index 24efc70df476..2f4222f73040 100644 --- a/include/basegfx/color/bcolortools.hxx +++ b/include/basegfx/color/bcolortools.hxx @@ -24,7 +24,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { class BColor; diff --git a/include/basegfx/curve/b2dbeziertools.hxx b/include/basegfx/curve/b2dbeziertools.hxx index 24286d917295..e0630484221f 100644 --- a/include/basegfx/curve/b2dbeziertools.hxx +++ b/include/basegfx/curve/b2dbeziertools.hxx @@ -33,7 +33,6 @@ namespace basegfx } - namespace basegfx { class BASEGFX_DLLPUBLIC B2DCubicBezierHelper @@ -51,7 +50,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_CURVE_B2DBEZIERTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx index 41a17ec25583..f6b955ca2ab5 100644 --- a/include/basegfx/matrix/b2dhommatrixtools.hxx +++ b/include/basegfx/matrix/b2dhommatrixtools.hxx @@ -27,8 +27,6 @@ #include <basegfx/basegfxdllapi.h> - - namespace basegfx { namespace tools @@ -137,7 +135,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { namespace tools @@ -176,7 +173,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { namespace tools @@ -224,7 +220,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_MATRIX_B2DHOMMATRIXTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx index cdcd322cf5f9..c38c53afdc52 100644 --- a/include/basegfx/polygon/b2dlinegeometry.hxx +++ b/include/basegfx/polygon/b2dlinegeometry.hxx @@ -28,7 +28,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace tools diff --git a/include/basegfx/polygon/b2dpolygonclipper.hxx b/include/basegfx/polygon/b2dpolygonclipper.hxx index 7fb2430c1dca..5a7a43bf9350 100644 --- a/include/basegfx/polygon/b2dpolygonclipper.hxx +++ b/include/basegfx/polygon/b2dpolygonclipper.hxx @@ -25,7 +25,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // predefinitions diff --git a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx index 89cf1012f075..0918e0e1d90d 100644 --- a/include/basegfx/polygon/b2dpolygoncutandtouch.hxx +++ b/include/basegfx/polygon/b2dpolygoncutandtouch.hxx @@ -25,7 +25,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace tools @@ -52,7 +51,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYGONCUTANDTOUCH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx index 70853afa137e..fbe924e0c953 100644 --- a/include/basegfx/polygon/b2dpolygontools.hxx +++ b/include/basegfx/polygon/b2dpolygontools.hxx @@ -32,7 +32,6 @@ #include <o3tl/typed_flags_set.hxx> - // Definitions for the cut flags used from the findCut methods enum class CutFlagValue { diff --git a/include/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx index 9ea03a5dcaa8..d3e92a017d79 100644 --- a/include/basegfx/polygon/b2dpolygontriangulator.hxx +++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx @@ -24,7 +24,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace triangulator diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx b/include/basegfx/polygon/b2dpolypolygoncutter.hxx index 37ce2ab9e3bd..136083ffcb2f 100644 --- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx +++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx @@ -24,7 +24,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { namespace tools @@ -146,8 +145,6 @@ namespace basegfx } // end of namespace basegfx - - #endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONCUTTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx index 1c9a23b56252..2131c7d2f2d1 100644 --- a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx +++ b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx @@ -23,7 +23,6 @@ #include <sal/types.h> - namespace basegfx { /** Fill rule to use for poly-polygon filling. diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx index 8d5d50f9afda..4c0891e7669d 100644 --- a/include/basegfx/polygon/b2dpolypolygontools.hxx +++ b/include/basegfx/polygon/b2dpolypolygontools.hxx @@ -31,8 +31,6 @@ #include <basegfx/basegfxdllapi.h> - - namespace basegfx { // predefinitions diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx index d56c48fbc425..7d4dec4fd85a 100644 --- a/include/basegfx/polygon/b2dtrapezoid.hxx +++ b/include/basegfx/polygon/b2dtrapezoid.hxx @@ -26,7 +26,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // class to hold a single trapezoid @@ -74,7 +73,6 @@ namespace basegfx } // end of namespace basegfx - namespace basegfx { namespace tools @@ -118,7 +116,6 @@ namespace basegfx } // end of namespace basegfx - #endif // INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx index 486c1321fee8..6c9c9b9c0808 100644 --- a/include/basegfx/polygon/b3dpolygon.hxx +++ b/include/basegfx/polygon/b3dpolygon.hxx @@ -119,8 +119,6 @@ namespace basegfx } // end of namespace basegfx - - #endif // INCLUDED_BASEGFX_POLYGON_B3DPOLYGON_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx index d6e01ef05e7e..9a2291004cde 100644 --- a/include/basegfx/polygon/b3dpolygontools.hxx +++ b/include/basegfx/polygon/b3dpolygontools.hxx @@ -28,7 +28,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // predefinitions diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx index 1326ffbcb69a..afb4acf00e67 100644 --- a/include/basegfx/polygon/b3dpolypolygontools.hxx +++ b/include/basegfx/polygon/b3dpolypolygontools.hxx @@ -29,7 +29,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { // predefinitions diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx index 7679f5a932dc..ae2c347e2b02 100644 --- a/include/basegfx/range/b2dconnectedranges.hxx +++ b/include/basegfx/range/b2dconnectedranges.hxx @@ -113,11 +113,9 @@ namespace basegfx aNewConnectedComponent.maTotalBounds = rRange; - // STAGE 1: Search for intersecting maDisjunctAggregatesList entries - // if rRange is empty, it will intersect with no // maDisjunctAggregatesList member. Thus, we can safe us // the check. @@ -192,7 +190,6 @@ namespace basegfx // STAGE 2: Add newly generated connected component list element - // add new component to the end of the component list aNewConnectedComponent.maComponentList.push_back( ComponentType( rRange, rUserData ) ); diff --git a/include/basegfx/tools/b2dclipstate.hxx b/include/basegfx/tools/b2dclipstate.hxx index 5cb6721e6ede..bd57a120a2ef 100644 --- a/include/basegfx/tools/b2dclipstate.hxx +++ b/include/basegfx/tools/b2dclipstate.hxx @@ -25,7 +25,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { class B2DRange; diff --git a/include/basegfx/tools/rectcliptools.hxx b/include/basegfx/tools/rectcliptools.hxx index 2d45ad1d26ce..dc737c765393 100644 --- a/include/basegfx/tools/rectcliptools.hxx +++ b/include/basegfx/tools/rectcliptools.hxx @@ -24,7 +24,6 @@ #include <basegfx/range/b2ibox.hxx> - namespace basegfx { namespace tools diff --git a/include/basegfx/tools/zoomtools.hxx b/include/basegfx/tools/zoomtools.hxx index 3b4cacf59553..808da8f0ef57 100644 --- a/include/basegfx/tools/zoomtools.hxx +++ b/include/basegfx/tools/zoomtools.hxx @@ -14,7 +14,6 @@ #include <basegfx/basegfxdllapi.h> - namespace basegfx { /** This namespace provides functions for optimized geometric zooming diff --git a/include/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx index e7a4c0f1fc8c..fbf951a6b66d 100644 --- a/include/basegfx/tuple/b2ituple.hxx +++ b/include/basegfx/tuple/b2ituple.hxx @@ -197,7 +197,6 @@ namespace basegfx // external operators - inline B2ITuple operator+(const B2ITuple& rTupA, const B2ITuple& rTupB) { B2ITuple aSum(rTupA); diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx index 60c9afec1561..1d5545f7f394 100644 --- a/include/basic/basicmanagerrepository.hxx +++ b/include/basic/basicmanagerrepository.hxx @@ -31,7 +31,6 @@ namespace basic { - //= BasicManagerRepository /** specifies a callback for instances which are interested in BasicManagers diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx index d6773bb01831..ce0d689e730e 100644 --- a/include/basic/vbahelper.hxx +++ b/include/basic/vbahelper.hxx @@ -32,7 +32,6 @@ namespace vba { */ - /** Locks or unlocks the controllers of all documents that have the same type as the specified document. @@ -52,7 +51,6 @@ BASIC_DLLPUBLIC void lockControllersOfAllDocuments( bool bLockControllers ); - /** Enables or disables the container windows of all controllers of all documents that have the same type as the specified document. @@ -73,7 +71,6 @@ BASIC_DLLPUBLIC void enableContainerWindowsOfAllDocuments( bool bEnableWindows ); - /** Registers the passed path as working directory for the application the passed document belongs to. @@ -89,7 +86,6 @@ BASIC_DLLPUBLIC void registerCurrentDirectory( const OUString& rPath ); - } // namespace vba } // namespace basic diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index e0ac82ac33ef..fdffd6f5b8e7 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -221,7 +221,6 @@ namespace canvas bool updateClipState( const Sprite::Reference& rSprite ); - /// Owning sprite canvas SpriteSurface::Reference mpSpriteCanvas; diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx index b5aabff3099e..1f893c90e326 100644 --- a/include/codemaker/global.hxx +++ b/include/codemaker/global.hxx @@ -83,7 +83,6 @@ private: }; - // Helper functions ::rtl::OString getTempDir(const ::rtl::OString& sFileName); diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx index 498d5be4b46d..c73249cb3b3f 100644 --- a/include/com/sun/star/uno/Reference.hxx +++ b/include/com/sun/star/uno/Reference.hxx @@ -359,8 +359,6 @@ inline Reference< interface_type > Reference< interface_type >::query( } - - inline bool BaseReference::operator == ( XInterface * pInterface ) const { if (_pInterface == pInterface) diff --git a/include/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx index 0af1cdaddf4a..023bc43f817a 100644 --- a/include/comphelper/InlineContainer.hxx +++ b/include/comphelper/InlineContainer.hxx @@ -54,7 +54,6 @@ public: }; - /** Creates a vector which contains an arbitrary number of elements. usage: @@ -77,7 +76,6 @@ public: }; - /** Creates a set which contains an arbitrary number of elements. usage: @@ -101,7 +99,6 @@ public: }; - /** usage: map< k, v > aMap( MakeMap< k, v > diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx index fdfeba6587bd..3755f363fac5 100644 --- a/include/comphelper/SelectionMultiplex.hxx +++ b/include/comphelper/SelectionMultiplex.hxx @@ -29,7 +29,6 @@ //= selection helper classes - namespace comphelper { diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index 9e80e94526cf..9370cdfae20e 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OCommonAccessibleComponent /** base class encapsulating common functionality for the helper classes implementing diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 4eae0f781bd1..ed029a053880 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= IMutex diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx index 9ed47cf2dcad..5514b39992fd 100644 --- a/include/comphelper/accessibleeventnotifier.hxx +++ b/include/comphelper/accessibleeventnotifier.hxx @@ -30,7 +30,6 @@ namespace comphelper { - //= AccessibleEventNotifier class COMPHELPER_DLLPUBLIC AccessibleEventNotifier diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx index cbe81a38a7d1..89ea8d71b050 100644 --- a/include/comphelper/accessiblekeybindinghelper.hxx +++ b/include/comphelper/accessiblekeybindinghelper.hxx @@ -33,7 +33,6 @@ namespace comphelper { - // OAccessibleKeyBindingHelper diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index ca6edea1e98e..bb222c3b55f5 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -34,7 +34,6 @@ namespace comphelper { - //= OCommonAccessibleSelection /** base class encapsulating common functionality for the helper classes implementing diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index ed9e6ac2221a..7dd0fc5155ef 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -29,12 +29,10 @@ #include <comphelper/comphelperdllapi.h> - namespace comphelper { - // OCommonAccessibleText /** base class encapsulating common functionality for the helper classes implementing @@ -97,7 +95,6 @@ namespace comphelper }; - // OAccessibleTextHelper @@ -142,8 +139,6 @@ namespace comphelper #endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX - - // OAccessibleTextHelper is a helper class for implementing the // XAccessibleText interface. @@ -174,5 +169,4 @@ namespace comphelper // copyText - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index f9b48e8c2e25..e89deeed501c 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -46,7 +46,6 @@ namespace comphelper { - //= OAccessibleWrapper diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx index 93b6c5bb8e0f..c115658c145c 100644 --- a/include/comphelper/anycompare.hxx +++ b/include/comphelper/anycompare.hxx @@ -35,7 +35,6 @@ namespace comphelper { - //= IKeyPredicateLess class SAL_NO_VTABLE IKeyPredicateLess diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx index edb488573b3b..4634cf72667a 100644 --- a/include/comphelper/classids.hxx +++ b/include/comphelper/classids.hxx @@ -92,7 +92,6 @@ #define SO3_SWGLOB_CLASSID SO3_SWGLOB_CLASSID_60 - /* * StarCalc */ diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index 839c6e7bd576..d5e3923eee14 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -28,7 +28,6 @@ namespace comphelper { - //= ComponentBase class COMPHELPER_DLLPUBLIC ComponentBase diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx index 6957f7397f66..cb6013900a32 100644 --- a/include/comphelper/componentguard.hxx +++ b/include/comphelper/componentguard.hxx @@ -30,7 +30,6 @@ namespace comphelper { - //= ComponentGuard class ComponentGuard diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx index be2bf0509499..51ea3e64e26b 100644 --- a/include/comphelper/configurationhelper.hxx +++ b/include/comphelper/configurationhelper.hxx @@ -36,7 +36,6 @@ namespace comphelper{ - class COMPHELPER_DLLPUBLIC ConfigurationHelper { public: diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx index 2cba09882991..730ebc651828 100644 --- a/include/comphelper/container.hxx +++ b/include/comphelper/container.hxx @@ -29,7 +29,6 @@ namespace comphelper { - //= IndexAccessIterator /** an iterator that iterates through all elements, starting from an XIndexAccess (pre-order) diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index ad973a21fe32..e1f9976d7f87 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -38,7 +38,6 @@ enum DocPasswordVerifierResult }; - /** Base class for a password verifier used by the DocPasswordHelper class below. @@ -90,7 +89,6 @@ public: }; - /** Helper that asks for a document password and checks its validity. */ class COMPHELPER_DLLPUBLIC DocPasswordHelper @@ -114,7 +112,6 @@ public: GenerateNewModifyPasswordInfo( const OUString& aPassword ); - /** This helper function allows to check whether the "Password to modify" provided by user is the correct one. @@ -134,8 +131,6 @@ public: const css::uno::Sequence< css::beans::PropertyValue >& aInfo ); - - /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" feature of Word. @@ -150,7 +145,6 @@ public: const OUString& aString ); - /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" and passwords related to table protection of Excel. @@ -171,7 +165,6 @@ public: rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); - /** This helper function generates the hash code based on the algorithm specified by MS for "Password to modify" and passwords related to table protection. @@ -192,7 +185,6 @@ public: rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 ); - /** This helper function generates a random sequence of bytes of requested length. */ @@ -201,7 +193,6 @@ public: sal_Int32 nLength ); - /** This helper function generates a byte sequence representing the key digest value used by MSCodec_Std97 codec. */ @@ -211,7 +202,6 @@ public: const css::uno::Sequence< sal_Int8 >& aDocId ); - /** This helper function generates a byte sequence representing the key digest value used by MSCodec_Std97 codec. */ @@ -229,7 +219,6 @@ public: const sal_uInt8 pDocId[16] ); - /** This helper function tries to request and verify a password to load a protected document. @@ -298,7 +287,6 @@ private: }; - } // namespace comphelper #endif diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx index ee44897344bf..31e2aad7482c 100644 --- a/include/comphelper/docpasswordrequest.hxx +++ b/include/comphelper/docpasswordrequest.hxx @@ -31,7 +31,6 @@ class AbortContinuation; class PasswordContinuation; - /** Selects which UNO document password request type to use. */ enum DocPasswordRequestType { @@ -40,7 +39,6 @@ enum DocPasswordRequestType }; - class COMPHELPER_DLLPUBLIC SimplePasswordRequest : public cppu::WeakImplHelper<css::task::XInteractionRequest> { @@ -64,7 +62,6 @@ private: }; - /** Implements the task.XInteractionRequest interface for requesting a password string for a document. */ @@ -98,7 +95,6 @@ private: }; - } // namespace comphelper #endif diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx index 07155054eee2..c30d79b40c95 100644 --- a/include/comphelper/documentinfo.hxx +++ b/include/comphelper/documentinfo.hxx @@ -28,7 +28,6 @@ namespace comphelper { - //= DocumentInfo namespace DocumentInfo diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx index 979665530bee..57bbab6947a0 100644 --- a/include/comphelper/evtlistenerhlp.hxx +++ b/include/comphelper/evtlistenerhlp.hxx @@ -30,7 +30,6 @@ namespace comphelper { - //= OCommandsListener // is helper class to avoid a cycle in refcount between the XEventListener // and the member XComponent diff --git a/include/comphelper/guarding.hxx b/include/comphelper/guarding.hxx index 64fca41f8044..7b5892c535cf 100644 --- a/include/comphelper/guarding.hxx +++ b/include/comphelper/guarding.hxx @@ -27,7 +27,6 @@ namespace comphelper { - // = class MutexRelease - diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index c9345ce64796..be9f798ac094 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -35,7 +35,6 @@ namespace comphelper { - //= OInteraction /** template for instantiating concret interaction handlers<p/> diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx index 65edfa5c36a1..9e51286ed8e6 100644 --- a/include/comphelper/listenernotification.hxx +++ b/include/comphelper/listenernotification.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OListenerContainer /** abstract base class which manages a listener container, including diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index e8987314ab5e..ef17801aa9f1 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -33,7 +33,6 @@ namespace comphelper { - //= string conversions, employed by the templatized log* members of //= EventLogger diff --git a/include/comphelper/namedvaluecollection.hxx b/include/comphelper/namedvaluecollection.hxx index 5fc0883b69cd..b7e64810d20b 100644 --- a/include/comphelper/namedvaluecollection.hxx +++ b/include/comphelper/namedvaluecollection.hxx @@ -36,7 +36,6 @@ namespace comphelper { - // = NamedValueCollection struct NamedValueCollection_Impl; diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx index 22b7a3c243a9..679d850fd467 100644 --- a/include/comphelper/officeresourcebundle.hxx +++ b/include/comphelper/officeresourcebundle.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OfficeResourceBundle class ResourceBundle_Impl; diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index f598236d703d..612667e54a33 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -30,12 +30,10 @@ //= property helper classes - namespace comphelper { - //= OPropertyAccessor //= internal helper class for OPropertyArrayAggregationHelper diff --git a/include/comphelper/propertysequence.hxx b/include/comphelper/propertysequence.hxx index 433834277035..28561a6904d7 100644 --- a/include/comphelper/propertysequence.hxx +++ b/include/comphelper/propertysequence.hxx @@ -36,7 +36,6 @@ namespace comphelper } // namespace comphelper - #endif // INCLUDED_COMPHELPER_PROPERTYSEQUENCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx index b10c61ba8d21..da1ed17f0116 100644 --- a/include/comphelper/propertystatecontainer.hxx +++ b/include/comphelper/propertystatecontainer.hxx @@ -34,7 +34,6 @@ namespace comphelper { - //= OPropertyStateContainer typedef ::cppu::ImplHelper1 < css::beans::XPropertyState diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx index ac4eb02cd26d..15d9da6899bb 100644 --- a/include/comphelper/propmultiplex.hxx +++ b/include/comphelper/propmultiplex.hxx @@ -28,7 +28,6 @@ //= property helper classes - namespace comphelper { diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx index 3b9a6a89dab1..aa3b50e4e25f 100644 --- a/include/comphelper/propstate.hxx +++ b/include/comphelper/propstate.hxx @@ -36,12 +36,10 @@ //= property helper classes - namespace comphelper { - //= OPropertyStateHelper /// helper class for implementing property states diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 5c791e57dd93..4b82e8b2c687 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -76,7 +76,6 @@ namespace comphelper { - //= OProxyAggregation /** helper class for aggregating a proxy for a foreign object @@ -216,7 +215,6 @@ namespace comphelper } // namespace comphelper - #endif // INCLUDED_COMPHELPER_PROXYAGGREGATION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index a70b29e8d761..df91bdb16dcd 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -36,7 +36,6 @@ namespace comphelper // stream for reading data from a sequence of bytes - class COMPHELPER_DLLPUBLIC SequenceInputStream : public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable > { diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx index 17d1b67c0d64..01775a47ce43 100644 --- a/include/comphelper/sequence.hxx +++ b/include/comphelper/sequence.hxx @@ -398,7 +398,6 @@ namespace comphelper } // namespace comphelper - #endif // INCLUDED_COMPHELPER_SEQUENCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index 13e48a67d089..51974ac65e79 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -28,7 +28,6 @@ namespace comphelper { - //= SharedMutex class COMPHELPER_DLLPUBLIC SharedMutex diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx index 910fd6c20f2f..2488e02ec925 100644 --- a/include/comphelper/synchronousdispatch.hxx +++ b/include/comphelper/synchronousdispatch.hxx @@ -35,12 +35,10 @@ namespace com { namespace sun { namespace star { } } } - namespace comphelper { - //= SynchronousDispatch /** a helper class for working with the dispatch interface replacing diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 6901e6c52ded..cf8584b79b47 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -73,7 +73,6 @@ namespace comphelper } - /** get a css::awt::FontDescriptor that is fully initialized with the XXX_DONTKNOW enum values (which isn't the case if you instantiate it via the default constructor) diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index a75a4abbb9d3..e3365e6f5866 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -160,7 +160,6 @@ namespace comphelper IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) - /** ask for an iface of an aggregated object usage:<br/> Reference<XFoo> xFoo;<br/> diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 187ca03fb3e8..23952e4e268d 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -32,7 +32,6 @@ namespace comphelper { - //= OWeakListenerAdapterBase /** (the base for) an adapter which allows to add as listener to a foreign component, without @@ -84,7 +83,6 @@ namespace comphelper }; - //= OWeakListenerAdapter template< class BROADCASTER, class LISTENER > diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 4aabd3ef6672..a9371b1783ce 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -528,7 +528,6 @@ namespace connectivity typedef ::rtl::Reference< OAssignValues > ORefAssignValues; - typedef ::rtl::Reference< OValueVector > OValueRow; typedef ::rtl::Reference< OValueRefVector > OValueRefRow; } diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index 2b4da40dd176..bca2af8983db 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -31,7 +31,6 @@ namespace dbtools { - //= OAutoConnectionDisposer typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener, diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index 66044f76d0ff..e988bb19d569 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -35,7 +35,6 @@ namespace dbtools { - //= OCharsetMap /** is a class which translates between different charset representations. @@ -114,7 +113,6 @@ namespace dbtools }; - //- OCharsetMap::CharsetIterator class OOO_DLLPUBLIC_DBTOOLS OCharsetMap::CharsetIterator diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 6e7cb972e16b..40d53d239767 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -47,7 +47,6 @@ namespace dbtools { - //= Special exception if cancel is pressed in DBA UI enum OOoBaseErrorCode diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index 1a1d53a02759..f4a9032c9a8c 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -31,7 +31,6 @@ namespace dbtools { - //= DatabaseMetaData struct DatabaseMetaData_Impl; diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index a9baa7faed04..2fc4a619c854 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -108,7 +108,6 @@ namespace dbtools const css::lang::Locale& _rLocale); - /** creates a connection which can be used for the rowset given The function tries to obtain a connection for the row set with the following @@ -554,7 +553,6 @@ namespace dbtools const css::uno::Any& _rValue); - /** ask the user for parameters if the prepared statement needs some and sets them in the prepared statement @param _xConnection the connection must be able to create css::sdb::SingleSelectQueryComposers @param _xPreparedStmt the prepared statement where the parameters could be set when needed diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx index 00a1b869627a..06869b5b0f0b 100644 --- a/include/connectivity/filtermanager.hxx +++ b/include/connectivity/filtermanager.hxx @@ -33,7 +33,6 @@ namespace dbtools { - //= FilterManager /** manages the filter of a database component with filter properties diff --git a/include/connectivity/odbc.hxx b/include/connectivity/odbc.hxx index bf66edd60b38..40ded2986df6 100644 --- a/include/connectivity/odbc.hxx +++ b/include/connectivity/odbc.hxx @@ -61,7 +61,6 @@ #endif - #ifdef UNX #ifndef ODBC_UNX @@ -80,7 +79,6 @@ #endif // UNX - #ifndef SQL_WCHAR #define SQL_WCHAR (-8) #endif diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 50d1efd821fc..c32fa6754f59 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -44,7 +44,6 @@ namespace param { - //= ParameterWrapper /** wraps a parameter column as got from an SQLQueryComposer, so that it has an additional diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx index 98b722f5e002..0d80598fa431 100644 --- a/include/connectivity/predicateinput.hxx +++ b/include/connectivity/predicateinput.hxx @@ -34,7 +34,6 @@ namespace dbtools { - //= OPredicateInputController /** A class which allows input of an SQL predicate for a row set column diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index 4ca46984a697..7778ac179667 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -41,7 +41,6 @@ namespace connectivity css::container::XNamed> OView_BASE; - class OOO_DLLPUBLIC_DBTOOLS OView : public ::comphelper::OMutexAndBroadcastHelper, public OView_BASE, diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx index 8218b5f8aa65..1484b905eb1b 100644 --- a/include/connectivity/sqlerror.hxx +++ b/include/connectivity/sqlerror.hxx @@ -30,7 +30,6 @@ namespace connectivity { - //= ErrorCondition /** the type of error codes to be used in SQLExceptions diff --git a/include/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx index 34420d85aaf2..0d3971fc5329 100644 --- a/include/connectivity/standardsqlstate.hxx +++ b/include/connectivity/standardsqlstate.hxx @@ -25,7 +25,6 @@ namespace dbtools { - /** standard SQLStates to be used with an SQLException Extend this list whenever you need a new state ... diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index 84151f65a282..e1cb17af49d3 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -31,7 +31,6 @@ namespace dbtools { - //= StatementComposer struct StatementComposer_Data; diff --git a/include/cppu/helper/purpenv/Mapping.hxx b/include/cppu/helper/purpenv/Mapping.hxx index c824607b60d5..01c998c07c07 100644 --- a/include/cppu/helper/purpenv/Mapping.hxx +++ b/include/cppu/helper/purpenv/Mapping.hxx @@ -48,7 +48,6 @@ typedef void ProbeFun( uno_Any ** ppException ); - PURPENV_DLLPUBLIC void createMapping(uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo, diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index ee8ac008c31f..90d80cb3df02 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -34,7 +34,6 @@ #include <cppuhelper/cppuhelperdllapi.h> - #define COMPONENT_GETENV "component_getImplementationEnvironment" #define COMPONENT_GETENVEXT "component_getImplementationEnvironmentExt" #define COMPONENT_WRITEINFO "component_writeInfo" @@ -115,7 +114,6 @@ typedef void * (SAL_CALL * component_getFactoryFunc)( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ); - namespace cppu { diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index 792cbe29c9c5..1d221b4cf6fb 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -204,7 +204,6 @@ private: }; - // helper defines needed for an interface container with a 32 bit key values struct equalInt32_Impl @@ -342,7 +341,6 @@ protected: }; - /** This abstract class maps the methods of the interfaces XMultiPropertySet, XFastPropertySet and XPropertySet to the methods getInfoHelper, convertFastPropertyValue, @@ -713,7 +711,6 @@ public: throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - private: OPropertySetHelper2( const OPropertySetHelper2 & ) SAL_DELETED_FUNCTION; OPropertySetHelper2 & operator = ( const OPropertySetHelper2 & ) @@ -735,5 +732,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx index dfeca36f2282..3f4ef39ca3f1 100644 --- a/include/dbaccess/dbaundomanager.hxx +++ b/include/dbaccess/dbaundomanager.hxx @@ -35,7 +35,6 @@ namespace dbaui { - //= UndoManager struct UndoManager_Impl; diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 81f5ada30caf..9ee916069836 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -42,7 +42,6 @@ namespace dbaui { - //= DBSubComponentController class DBSubComponentController; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 87155342149a..c31e91d3bb1b 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -141,7 +141,6 @@ namespace dbaui // = helper - struct ControllerFeature : public css::frame::DispatchInformation { sal_uInt16 nFeatureId; @@ -258,8 +257,6 @@ namespace dbaui bool m_bExternalTitle : 1; - - // attribute access ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } diff --git a/include/drawinglayer/animation/animationtiming.hxx b/include/drawinglayer/animation/animationtiming.hxx index 2d07106843fc..0fcd2867cddb 100644 --- a/include/drawinglayer/animation/animationtiming.hxx +++ b/include/drawinglayer/animation/animationtiming.hxx @@ -25,7 +25,6 @@ #include <vector> - namespace drawinglayer { namespace animation @@ -50,7 +49,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry { protected: @@ -69,7 +67,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry { protected: @@ -90,7 +87,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryList : public AnimationEntry { protected: @@ -113,7 +109,6 @@ namespace drawinglayer }; - class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop : public AnimationEntryList { protected: @@ -135,7 +130,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillbitmapattribute.hxx b/include/drawinglayer/attribute/fillbitmapattribute.hxx index cebcca818e4d..fedcaaa309a5 100644 --- a/include/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/include/drawinglayer/attribute/fillbitmapattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index 454e633cf46b..ff3d3ebe81e3 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -52,7 +52,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace attribute @@ -101,7 +100,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx index 3e6d22bf5052..87304c6cd71a 100644 --- a/include/drawinglayer/attribute/fillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx @@ -36,7 +36,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx index aee4a2d233ac..58c643b54283 100644 --- a/include/drawinglayer/attribute/fillhatchattribute.hxx +++ b/include/drawinglayer/attribute/fillhatchattribute.hxx @@ -49,7 +49,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace attribute @@ -106,7 +105,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx index d053e42edd85..1b35189a6993 100644 --- a/include/drawinglayer/attribute/fontattribute.hxx +++ b/include/drawinglayer/attribute/fontattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index 6fd84c9ba4fd..a405ebce540c 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -79,7 +78,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx index 399e6c2fc08f..8f348bef5841 100644 --- a/include/drawinglayer/attribute/linestartendattribute.hxx +++ b/include/drawinglayer/attribute/linestartendattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx index 7ab243214dc8..db144b7a030a 100644 --- a/include/drawinglayer/attribute/materialattribute3d.hxx +++ b/include/drawinglayer/attribute/materialattribute3d.hxx @@ -35,7 +35,6 @@ namespace basegfx { } - namespace drawinglayer { namespace attribute @@ -76,7 +75,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx index 8bb1d6659ae9..b68f0a303e40 100644 --- a/include/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrallattribute3d.hxx @@ -32,7 +32,6 @@ // predefines - namespace drawinglayer { namespace attribute @@ -70,7 +69,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx index fa70f82d5845..434954757bdb 100644 --- a/include/drawinglayer/attribute/sdrfillattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -81,7 +80,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx index a3ed6a81cc35..b3163a5bb288 100644 --- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLGRAPHICATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx index 32b7aa98a2f8..3d91e54d7189 100644 --- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -36,7 +36,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -73,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx index 48e9cd710786..70e0e450b210 100644 --- a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -39,7 +39,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -81,7 +80,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx index ecd2fd1c5d29..af1e1561f4f9 100644 --- a/include/drawinglayer/attribute/sdrlineattribute.hxx +++ b/include/drawinglayer/attribute/sdrlineattribute.hxx @@ -38,7 +38,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -85,7 +84,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx index 548751ce2c69..d56a265c8159 100644 --- a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -84,7 +83,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx index ba34c323f3e0..b4ea75bfbf87 100644 --- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -37,7 +37,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -90,7 +89,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx index 48b1d8cea043..bdd0edf1c826 100644 --- a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -34,7 +34,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -76,7 +75,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx index d3b0d0ce988f..d92110dbdb49 100644 --- a/include/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx @@ -36,7 +36,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx index 83be2d6c0851..69576edf56d6 100644 --- a/include/drawinglayer/attribute/strokeattribute.hxx +++ b/include/drawinglayer/attribute/strokeattribute.hxx @@ -32,7 +32,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -69,7 +68,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 79e3eb42e92c..1c67f09b6d85 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -41,7 +41,6 @@ namespace basegfx { } - namespace drawinglayer { namespace geometry @@ -169,7 +168,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx index c5f2da0ce833..16c577b1b1fe 100644 --- a/include/drawinglayer/geometry/viewinformation3d.hxx +++ b/include/drawinglayer/geometry/viewinformation3d.hxx @@ -39,7 +39,6 @@ namespace basegfx { } - namespace drawinglayer { namespace geometry @@ -166,7 +165,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 9e13a8e60584..2c61a3ea7c82 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -33,7 +33,6 @@ namespace drawinglayer { namespace animation { }} - namespace drawinglayer { namespace primitive2d @@ -98,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -129,7 +127,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -166,7 +163,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index e58d31c5fbdc..b867bd6a0699 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -83,7 +83,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 860b9a422c99..fe6af495f2d0 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -290,7 +290,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index df0e60d0709f..c7eb9e32cf37 100644 --- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -74,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index f152f2d00a64..a69c747ae32a 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/table/BorderLineStyle.hpp> - namespace drawinglayer { namespace primitive2d @@ -145,7 +144,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index 8e305e834221..ed77d0599cd9 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/awt/XControl.hpp> - namespace drawinglayer { namespace primitive2d @@ -107,7 +106,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx index ec2d46929db0..44386cf9f377 100644 --- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -96,7 +95,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CROPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 61657dc77cae..e222ff307d08 100644 --- a/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -72,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index c080c633b86f..34b9b6bc0b69 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -115,7 +115,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETESHADOWPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 72ada3d42488..c199ebb6fc7c 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -116,7 +116,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index 4367e17556c1..377354a34500 100644 --- a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -82,7 +82,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 92104cd9a172..f8c5af8146e9 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -113,7 +113,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index 22acf73e9e65..1863db6df846 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -81,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRAPHICPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 76916853e328..a92ea66071af 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -102,7 +102,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index 20c3da3e7ca6..a0679afc766d 100644 --- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -27,7 +27,6 @@ #include <svtools/grfmgr.hxx> - namespace drawinglayer { namespace primitive2d @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx index 7234f7c68deb..673527f38851 100644 --- a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx @@ -29,7 +29,6 @@ class Graphic; - namespace drawinglayer { namespace primitive2d @@ -65,7 +64,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVEHELPER2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index 83067a98bd01..7eb97936cec1 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -113,7 +113,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx index 0cb63500e769..a41c3fb18750 100644 --- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -89,7 +89,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx index dc3fb972dc8a..55ebd0390daf 100644 --- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -108,7 +108,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index ed2cfa27aee2..cd060e2dfabf 100644 --- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -58,7 +57,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx index 1351cc3c7a30..86dd3f8eb7b7 100644 --- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -53,7 +52,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 966cc86e935a..0da542cf7992 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -82,7 +82,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index 042097e3eb25..dc6e4d8a13de 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive2d @@ -73,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index 18e7da12c9a1..762af60e36a1 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -28,7 +28,6 @@ #include <vcl/graphic.hxx> - namespace drawinglayer { namespace primitive2d @@ -91,7 +90,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index adb14339de21..217dd8eacc86 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -88,7 +88,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index d5f84b04af8c..eab02ebc970f 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX @@ -28,7 +27,6 @@ #include <basegfx/color/bcolormodifier.hxx> - namespace drawinglayer { namespace primitive2d @@ -75,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 03795aa406f9..983d8c15ea02 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -98,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index e9d8b388cbf0..08f30cd61b83 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive2d @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PATTERNFILLPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index 46a2e39d806d..841b1ae7de96 100644 --- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -77,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx index 4d8d05a4923d..6ba826576846 100644 --- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -311,7 +311,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 7698f1359e81..b31832093cf1 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -466,7 +466,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx index 26e60d10d071..c74c7905ccce 100644 --- a/include/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -72,7 +71,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -111,7 +109,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -150,7 +147,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -193,7 +189,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETOOLS2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index 9c3fb8e9d846..1babf95f4d70 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -32,7 +32,6 @@ #include <drawinglayer/attribute/sdrlightattribute3d.hxx> - namespace drawinglayer { namespace primitive2d @@ -153,7 +152,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index 40d54ab173c4..295c558fca28 100644 --- a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -33,7 +33,6 @@ namespace basegfx { } - namespace drawinglayer { namespace primitive2d @@ -65,7 +64,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index d4bcc7189710..8892d359cd76 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/color/bcolor.hxx> - namespace drawinglayer { namespace primitive2d @@ -82,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 1e6115b1461c..4907186d4183 100644 --- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -26,7 +26,6 @@ #include <vcl/pdfwriter.hxx> - namespace drawinglayer { namespace primitive2d @@ -65,7 +64,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 98a15967f790..33c9d6ffe2bd 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -414,7 +414,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SVGGRADIENTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index 1f6d598f08fa..bc5fa89eaef9 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace drawinglayer { namespace primitive2d @@ -77,7 +76,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTBREAKUPHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx index c7c1d24fba97..7c1a0fec81af 100644 --- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -100,7 +99,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx index 78a48c678284..678b75d986e7 100644 --- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -26,7 +26,6 @@ #include <vcl/vclenum.hxx> - namespace drawinglayer { namespace primitive2d @@ -98,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index a21e36490f50..7eb0ed9c6163 100644 --- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -26,7 +26,6 @@ #include <rtl/ustring.hxx> - namespace drawinglayer { namespace primitive2d @@ -54,7 +53,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -77,7 +75,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -100,7 +97,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -123,7 +119,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -177,7 +172,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -206,7 +200,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx index b465c008513c..048731f228e6 100644 --- a/include/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -28,7 +28,6 @@ #include <basegfx/color/bcolor.hxx> - namespace drawinglayer { namespace primitive2d @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index bfd4f20eca24..488b70728daf 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -38,7 +38,6 @@ class OutputDevice; - namespace drawinglayer { namespace primitive2d @@ -189,7 +188,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 8582e4d71b04..c28c5f910930 100644 --- a/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/lang/Locale.hpp> - namespace drawinglayer { namespace primitive2d @@ -64,7 +63,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -105,7 +103,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -146,7 +143,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index c0f7cf89fa21..fa56e61322d9 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace primitive2d @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx index af932ed07354..8f86456235a6 100644 --- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -82,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 2b23527cda56..0431f65c6f2b 100644 --- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/groupprimitive2d.hxx> - namespace drawinglayer { namespace primitive2d @@ -70,7 +69,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index 5fc00a5d53d9..c48bda251f6a 100644 --- a/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -27,7 +27,6 @@ #include <vcl/wall.hxx> - namespace drawinglayer { namespace primitive2d @@ -81,7 +80,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index aa530dae845d..7a4ca365f4f4 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -86,7 +86,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx index 2e1c9b0d7d90..27d2226136b7 100644 --- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -222,7 +222,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index 30be6c30efea..54141823e1b5 100644 --- a/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/include/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx @@ -49,7 +49,6 @@ #define PRIMITIVE3D_ID_HIDDENGEOMETRYPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 18) - #endif // INCLUDED_DRAWINGLAYER_PRIMITIVE3D_DRAWINGLAYER_PRIMITIVETYPES3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx index 1637a0c85ff1..9abc75c4f6f5 100644 --- a/include/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/baseprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index 6be6c2eeae0e..d088c05bced6 100644 --- a/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/attribute/fillhatchattribute.hxx> - namespace drawinglayer { namespace primitive3d @@ -80,7 +79,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index afd1b218edde..eeb1a87957c1 100644 --- a/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/groupprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -60,7 +59,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index 9e1235dc7c97..e6381d2c15e1 100644 --- a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/color/bcolormodifier.hxx> - namespace drawinglayer { namespace primitive3d @@ -63,7 +62,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx index 2201b67b1563..d586e26bbad4 100644 --- a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -29,7 +29,6 @@ #include <drawinglayer/attribute/strokeattribute.hxx> - namespace drawinglayer { namespace primitive3d @@ -74,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -123,7 +121,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index f8e312fb85e5..e450e0705f31 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -33,7 +33,6 @@ namespace basegfx { } - namespace drawinglayer { namespace primitive3d @@ -102,7 +101,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 7d3476a3553d..89fc50ce1521 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -27,7 +27,6 @@ #include <drawinglayer/attribute/materialattribute3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -77,7 +76,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index 7d94dcb62c5e..4580a465c2b5 100644 --- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -63,7 +62,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 28c093649e3c..a76cf4d54f93 100644 --- a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -45,7 +45,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace primitive3d @@ -92,7 +91,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 7acd8a67858a..e9199c4d8087 100644 --- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -34,7 +34,6 @@ namespace drawinglayer { namespace geometry { }} - namespace drawinglayer { namespace primitive3d @@ -123,7 +122,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 3f3dfec55443..4ba131b73d4c 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive3d @@ -123,7 +122,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 785022928dbf..7bd11fa9341d 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace primitive3d @@ -129,7 +128,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 8d2d1aab2aef..927d5e621f87 100644 --- a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -75,7 +74,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx index 460fd458591d..1dded61f002b 100644 --- a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -30,7 +30,6 @@ #include <drawinglayer/attribute/sdrobjectattribute3d.hxx> - namespace drawinglayer { /** SdrPrimitive3D class @@ -82,7 +81,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index d33b5960bf9f..fbbba0502344 100644 --- a/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> - namespace drawinglayer { namespace primitive3d @@ -74,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx index 5b10da20bca4..23f4abb75e56 100644 --- a/include/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -27,7 +27,6 @@ #include <basegfx/color/bcolor.hxx> - namespace drawinglayer { namespace primitive3d @@ -78,7 +77,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx index 242bb55a43ef..b4abb8f07feb 100644 --- a/include/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -29,7 +29,6 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> - namespace drawinglayer { namespace primitive3d @@ -73,7 +72,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -115,7 +113,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -154,7 +151,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -193,7 +189,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive3d @@ -224,7 +219,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx index 35bb4ceaa60e..848b88670b82 100644 --- a/include/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b3dhommatrix.hxx> - namespace drawinglayer { namespace primitive3d @@ -68,7 +67,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx index b2e0ce895e62..ba9053e100af 100644 --- a/include/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/geometry/viewinformation2d.hxx> - namespace drawinglayer { namespace processor2d @@ -190,7 +189,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx index 0bab96cd7ca9..dd06df9c4f11 100644 --- a/include/drawinglayer/processor2d/contourextractor2d.hxx +++ b/include/drawinglayer/processor2d/contourextractor2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace drawinglayer { namespace processor2d @@ -62,7 +61,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx index 1afe0debd3a0..389f8768dae1 100644 --- a/include/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/include/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> - namespace drawinglayer { namespace processor2d @@ -60,7 +59,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 97982f75e70f..b7900b29e882 100644 --- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -29,7 +29,6 @@ #include <vector> - namespace drawinglayer { namespace processor2d @@ -92,7 +91,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx index 73b353aa06f2..0d03a7d5e1ce 100644 --- a/include/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/include/drawinglayer/processor3d/baseprocessor3d.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> - namespace drawinglayer { namespace processor3d @@ -69,7 +68,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index bc4279f8ede7..e70f552661e4 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/processor3d/defaultprocessor3d.hxx> - namespace drawinglayer { namespace processor3d @@ -79,7 +78,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index a40e129d6bda..9753d3de4d79 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -57,7 +57,6 @@ namespace drawinglayer { namespace texture { }} - namespace drawinglayer { namespace processor3d @@ -150,7 +149,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx index d900139184cc..313546726308 100644 --- a/include/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx @@ -29,7 +29,6 @@ #include <basegfx/color/bcolormodifier.hxx> - namespace drawinglayer { namespace processor3d diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 8919f51f3729..e6a66f3b4416 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -33,7 +33,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace drawinglayer { namespace processor3d diff --git a/include/drawinglayer/texture/texture.hxx b/include/drawinglayer/texture/texture.hxx index 3f1d6d07adc0..bbe620433a00 100644 --- a/include/drawinglayer/texture/texture.hxx +++ b/include/drawinglayer/texture/texture.hxx @@ -51,7 +51,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -67,7 +66,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -102,7 +100,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -134,7 +131,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -165,7 +161,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -192,7 +187,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -220,7 +214,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -248,7 +241,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -276,7 +268,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -313,7 +304,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace texture @@ -350,7 +340,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif //_DRAWINGLAYER_TEXTURE_TEXTURE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/tools/converters.hxx b/include/drawinglayer/tools/converters.hxx index c004e25a7a3c..5b266b3677b8 100644 --- a/include/drawinglayer/tools/converters.hxx +++ b/include/drawinglayer/tools/converters.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> - namespace drawinglayer { namespace tools @@ -43,7 +42,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_DRAWINGLAYER_TOOLS_CONVERTERS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/AccessibleStringWrap.hxx b/include/editeng/AccessibleStringWrap.hxx index 3e86f609e9d0..5a2dd3440528 100644 --- a/include/editeng/AccessibleStringWrap.hxx +++ b/include/editeng/AccessibleStringWrap.hxx @@ -30,11 +30,9 @@ class Rectangle; class Point; - // AccessibleStringWrap declaration - class AccessibleStringWrap { public: diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index 3e23250c2a69..ef5ea81ab95e 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -37,7 +37,6 @@ #define DEF_LINE_WIDTH_5 10 - namespace editeng { // values from css::table::BorderLineStyle diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 11e120317576..04fbfb591d01 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -111,7 +111,6 @@ class DeletedNodeInfo; class ParaPortionList; - /** values for: SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs_All ); */ diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 2dcaa0631043..82770266375c 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -40,7 +40,6 @@ class MetaAction; // class SvxFieldItem --------------------------------------------------- - class EDITENG_DLLPUBLIC SvxFieldData : public SvPersistBase { public: @@ -307,7 +306,6 @@ enum SvxFileFormat { SVXFILEFORMAT_NAME_EXT = 0, // File name with Extension }; - class EDITENG_DLLPUBLIC SvxExtFileField : public SvxFieldData { private: @@ -414,8 +412,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index f651e9bbb960..0e8a91253e09 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -62,8 +62,6 @@ public: }; - - #endif diff --git a/include/editeng/frmdir.hxx b/include/editeng/frmdir.hxx index e088e834724e..4af2a077ee1a 100644 --- a/include/editeng/frmdir.hxx +++ b/include/editeng/frmdir.hxx @@ -21,7 +21,6 @@ #define INCLUDED_EDITENG_FRMDIR_HXX - /** Defines possible text directions in frames. */ enum SvxFrameDirection { @@ -46,7 +45,6 @@ enum SvxFrameDirection }; - #endif // INCLUDED_EDITENG_FRMDIR_HXX diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 24525a869382..8665de962f71 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -82,9 +82,6 @@ public: }; - - - #endif diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index f92f72cb3e5e..ee6150f7288f 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -41,7 +41,6 @@ OUString GetColorString( const Color& rCol ); EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( SfxMapUnit eUnit ); - inline long Scale( long nVal, long nMult, long nDiv ) { BigInt aVal( nVal ); diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index bbb5a702f633..467b0ae4a51c 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -57,7 +57,6 @@ public: }; - class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem { public: @@ -90,7 +89,6 @@ public: }; - class EDITENG_DLLPUBLIC SvxJustifyMethodItem: public SfxEnumItem { public: diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 70ebf75515fb..a6a76da536d0 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -23,7 +23,6 @@ #include <editeng/editengdllapi.h> - // class SvxLineItem ----------------------------------------------------- @@ -68,8 +67,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index fff1b3fed6db..31dc1685b674 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -50,7 +50,6 @@ public: }; - #endif // INCLUDED_EDITENG_MEASFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index 749874010c77..15f8fe607e8e 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -49,7 +49,6 @@ public: }; - #endif diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index 986c77652dd6..59ff46fe5677 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -62,7 +62,6 @@ inline SvxOpaqueItem &SvxOpaqueItem::operator=( const SvxOpaqueItem &rCpy ) } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 3e5447e111cd..5bcb65743413 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -23,7 +23,6 @@ #include <editeng/editengdllapi.h> - // class SvxPrintItem ---------------------------------------------------- @@ -63,8 +62,6 @@ inline SvxPrintItem &SvxPrintItem::operator=( const SvxPrintItem &rCpy ) } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index da2772cce8f2..e6f930557d71 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -84,8 +84,6 @@ inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy ) } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index a233ffff09ce..0e9c6d5c56e5 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -20,7 +20,6 @@ #define INCLUDED_EDITENG_SVXENUM_HXX - enum SvxCaseMap { SVX_CASEMAP_NOT_MAPPED, diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index fe094daef879..761d10995c0c 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -38,7 +38,6 @@ namespace vcl { class Window; } namespace linguistic { enum class DictionaryError; } - class EDITENG_DLLPUBLIC LinguMgr { friend class LinguMgrExitLstnr; @@ -84,7 +83,6 @@ public: }; - namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; }}}} @@ -112,8 +110,6 @@ EDITENG_DLLPUBLIC SvxAlternativeSpelling SvxGetAltSpelling( const css::uno::Reference< css::linguistic2::XHyphenatedWord > & rHyphWord ); - - class EDITENG_DLLPUBLIC SvxDicListChgClamp { private: @@ -130,7 +126,6 @@ public: }; - //TODO: remove those functions or make them inline EDITENG_DLLPUBLIC css::uno::Reference< css::linguistic2::XSpellChecker1 > SvxGetSpellChecker(); @@ -161,5 +156,4 @@ EDITENG_DLLPUBLIC short SvxDicError( vcl::Window *pParent, linguistic::Dictionar #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 498d41761736..ddd2a04593a8 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -66,7 +66,6 @@ #define UNO_NAME_FILLBMP_MODE "FillBitmapMode" - #define UNO_NAME_LINESTYLE "LineStyle" #define UNO_NAME_LINEDASH "LineDash" #define UNO_NAME_LINEWIDTH "LineWidth" diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index ff68e5584c52..d04b88883ee9 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -351,7 +351,6 @@ public: }; - class SvxUnoTextBase; class EDITENG_DLLPUBLIC SvxUnoTextRange : public SvxUnoTextRangeBase, public css::lang::XTypeProvider, @@ -483,7 +482,6 @@ public: }; - class SvxUnoTextContentEnumeration : public ::cppu::WeakAggImplHelper1< css::container::XEnumeration > { private: @@ -578,7 +576,6 @@ public: }; - class SvxUnoTextRangeEnumeration : public ::cppu::WeakAggImplHelper1< css::container::XEnumeration > { private: @@ -599,7 +596,6 @@ public: }; - class EDITENG_DLLPUBLIC SvxUnoTextCursor : public SvxUnoTextRangeBase, public css::text::XTextCursor, public css::lang::XTypeProvider, diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 14b6e3c65e88..d6c584984d20 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -26,7 +26,6 @@ class SvXMLNamespaceMap; - class SvXMLAttrContainerData; class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx index 72b4181930f7..afb3ddbaa8cc 100644 --- a/include/filter/msfilter/countryid.hxx +++ b/include/filter/msfilter/countryid.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX #define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX @@ -27,7 +26,6 @@ #include <filter/msfilter/msfilterdllapi.h> - namespace msfilter { // Windows Country IDs ======================================================== @@ -301,11 +299,9 @@ MSFILTER_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage ); MSFILTER_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry ); - } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 7150b30846de..673306aff4dd 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -135,7 +135,6 @@ enum ESCHER_wMode }; - enum ESCHER_ShapePath { ESCHER_ShapeLines, // A line of straight segments @@ -627,7 +626,6 @@ struct EscherPropertyValueHelper }; - struct EscherPersistEntry { sal_uInt32 mnID; @@ -638,7 +636,6 @@ struct EscherPersistEntry }; - class EscherBlibEntry { @@ -680,7 +677,6 @@ public: }; - #define _E_GRAPH_PROV_USE_INSTANCES 1 #define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2 @@ -758,7 +754,6 @@ public: }; - #define ESCHER_CREATEPOLYGON_LINE 1 #define ESCHER_CREATEPOLYGON_POLYLINE 2 #define ESCHER_CREATEPOLYGON_POLYPOLYGON 4 @@ -970,7 +965,6 @@ public: }; - class MSFILTER_DLLPUBLIC EscherPersistTable { @@ -989,7 +983,6 @@ public: }; - class EscherEx; /// abstract base class for ESCHER_ClientTextbox, ESCHER_ClientData @@ -1077,8 +1070,6 @@ public: }; - - /** Instance for global DFF data, shared through various instances of EscherEx. */ class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider { diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index 4f5676b7f045..2e5811e899c8 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -30,7 +30,6 @@ namespace msfilter { - /** Encodes and decodes data from protected MSO 95- documents. */ class MSFILTER_DLLPUBLIC MSCodec_Xor95 @@ -173,8 +172,6 @@ public: }; - - /** Encodes and decodes data from protected MSO 97+ documents. This is a wrapper class around low level cryptographic functions from RTL. @@ -356,7 +353,6 @@ private: }; - } // namespace msfilter #endif diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx index e1e257f32755..f58c9242ceb0 100644 --- a/include/filter/msfilter/msoleexp.hxx +++ b/include/filter/msfilter/msoleexp.hxx @@ -45,7 +45,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index acd6e593460a..262388fc7992 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -31,7 +31,6 @@ namespace ooo { namespace vba { - struct MSFILTER_DLLPUBLIC MacroResolvedInfo { SfxObjectShell* mpDocContext; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 0b2234d33b35..1aa4b26087d1 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -464,8 +464,6 @@ public: }; - - class SvxFieldItem; struct MSFILTER_DLLPUBLIC PPTFieldEntry { @@ -519,7 +517,6 @@ struct ProcessData }; - class SdrTextObj; class SfxObjectShell; diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 33b26b105fc9..f42555419ec1 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -47,7 +47,6 @@ class SfxObjectShell; */ - class MSFILTER_DLLPUBLIC SvxImportMSVBasic { public: diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 760f4b3e10a9..90e46d6c702f 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -36,7 +36,6 @@ namespace formula enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA, FORMULA_FORMDLG_ARGS, FORMULA_FORMDLG_EDIT }; - class FormulaDlg_Impl; class IControlReferenceHandler; class IFunctionDescription; diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx index 6a33919c43fd..667b11b727ac 100644 --- a/include/framework/undomanagerhelper.hxx +++ b/include/framework/undomanagerhelper.hxx @@ -38,7 +38,6 @@ namespace framework { - //= IMutexGuard class SAL_NO_VTABLE IMutexGuard diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx index 26675c3e0082..22cf78512f85 100644 --- a/include/i18nlangtag/mslangid.hxx +++ b/include/i18nlangtag/mslangid.hxx @@ -183,7 +183,6 @@ public: static void setConfiguredAsianFallback( LanguageType nLang ); - /** Encapsulated methods that shall only be accessed through class LanguageTag. */ @@ -200,7 +199,6 @@ public: }; - struct LanguagetagMapping { OUString maBcp47; @@ -216,7 +214,6 @@ public: static ::std::vector< LanguagetagMapping > getDefinedLanguagetags(); - /** Encapsulated conversion methods used by LanguageTag and conversions, not to be used by anything else. */ diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index c0e0419a11c1..6265d1aa4096 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.hxx @@ -107,5 +107,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index 1095e4555182..c887b67e424a 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -33,7 +33,6 @@ namespace oox { namespace core { - namespace CodecHelper { /** Returns the password hash if it is in the required 16-bit limit. */ @@ -41,7 +40,6 @@ namespace CodecHelper } - /** Encodes and decodes data from/to protected MS Office documents. Implements a simple XOR encoding/decoding algorithm used in MS Office @@ -166,7 +164,6 @@ private: }; - /** Encodes and decodes data from protected MSO 97+ documents. This is a wrapper class around low level cryptographic functions from RTL. @@ -298,7 +295,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index 497bb0029166..fef376fbcaf5 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -36,7 +36,6 @@ namespace oox { namespace core { - /** Wrapper for a fast SAX parser that works on automatically generated OOXML token and namespace identifiers. */ @@ -96,7 +95,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 744d9225870c..339d3caa2d75 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -32,7 +32,6 @@ namespace oox { namespace core { - /** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface that provides access to the tokens generated from the internal token name list. */ @@ -62,7 +61,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 519e63ff0504..bed536660d7f 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -111,7 +111,6 @@ public: virtual bool exportDocument() = 0; - /** Returns the component context passed in the filter constructor (always existing). */ const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() const; diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 9ac48df128c8..e0636e003cb5 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -40,7 +40,6 @@ namespace oox { namespace core { - /** Document handler specifically designed for detecting OOXML file formats. It takes a reference to the filter string object via its constructor, and @@ -150,7 +149,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index f1110db8cf13..952d301b7965 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -34,7 +34,6 @@ namespace oox { namespace core { - /** Base data of a fragment. This data is stored in a separate struct to make it accessible in every @@ -55,7 +54,6 @@ struct FragmentBaseData }; - /** Describes record identifiers used to create contexts in a binary stream. If a record is used to start a new context, usually the record identifier @@ -73,7 +71,6 @@ struct RecordInfo }; - typedef ::cppu::ImplInheritanceHelper< ContextHandler, css::xml::sax::XFastDocumentHandler > FragmentHandler_BASE; class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE @@ -120,7 +117,6 @@ protected: typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef; - } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index 200be17e360d..8ec3c00474a3 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -29,7 +29,6 @@ namespace oox { namespace core { - class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper { protected: @@ -114,7 +113,6 @@ public: typedef ::rtl::Reference< FragmentHandler2 > FragmentHandler2Ref; - } // namespace core } // namespace oox diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index 03c69042cf88..a9909a0db596 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -34,7 +34,6 @@ namespace prv { class Locator; } namespace prv { class ContextStack; } - struct RecordInputSource { BinaryInputStreamRef mxInStream; @@ -43,7 +42,6 @@ struct RecordInputSource }; - class RecordParser { public: @@ -79,7 +77,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index 6f9fd44a9305..018634972535 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -29,7 +29,6 @@ namespace oox { namespace core { - /** Expands to an OUString containing an 'officeDocument' transitional relation type created from the passed literal(!) ASCII(!) character array. */ #define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \ @@ -64,7 +63,6 @@ struct Relation }; - class Relations; typedef std::shared_ptr< Relations > RelationsRef; @@ -117,7 +115,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index d7ceb73238e3..8d1237adfbf4 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -26,7 +26,6 @@ namespace oox { namespace core { - class RelationsFragment : public FragmentHandler { public: @@ -45,7 +44,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index a93a50802e0d..87f408f76d4b 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -97,7 +97,6 @@ public: virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0; - OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rPart ); /** Imports a fragment using the passed fragment handler, which contains diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index ebce01a4006d..f8ee8d043d27 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -42,7 +42,6 @@ struct ChartSpaceModel; struct DataSequenceModel; - class OOX_DLLPUBLIC ChartConverter { public: @@ -94,7 +93,6 @@ private: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx index e6539cae744c..b09558f4b5ba 100644 --- a/include/oox/drawingml/chart/datasourcemodel.hxx +++ b/include/oox/drawingml/chart/datasourcemodel.hxx @@ -28,7 +28,6 @@ namespace drawingml { namespace chart { - struct DataSequenceModel { typedef ::std::map< sal_Int32, css::uno::Any > AnyMap; @@ -43,7 +42,6 @@ struct DataSequenceModel }; - struct DataSourceModel { typedef ModelRef< DataSequenceModel > DataSequenceRef; @@ -55,7 +53,6 @@ struct DataSourceModel }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 110b0d6e36f3..98352cbc11e8 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -36,7 +36,6 @@ namespace oox { namespace drawingml { - class OOX_DLLPUBLIC Color { public: diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 11b62e362541..64de3a080052 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -36,7 +36,6 @@ namespace oox { namespace drawingml { - const sal_Int32 PER_PERCENT = 1000; const sal_Int32 MAX_PERCENT = 100 * PER_PERCENT; @@ -44,7 +43,6 @@ const sal_Int32 PER_DEGREE = 60000; const sal_Int32 MAX_DEGREE = 360 * PER_DEGREE; - struct LineProperties; typedef std::shared_ptr< LineProperties > LinePropertiesPtr; @@ -78,7 +76,6 @@ class Theme; typedef std::shared_ptr< Theme > ThemePtr; - namespace table { class TableProperties; @@ -87,7 +84,6 @@ typedef std::shared_ptr< TableProperties > TablePropertiesPtr; } // namespace table - /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ css::awt::Point GetPointPercent( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs ); @@ -141,7 +137,6 @@ OOX_DLLPUBLIC const char* GetTextVerticalAdjust( css::drawing::TextVerticalAdjus const char* GetHatchPattern( const css::drawing::Hatch& rHatch ); - // CT_IndexRange struct IndexRange { sal_Int32 start; @@ -152,7 +147,6 @@ struct IndexRange { IndexRange GetIndexRange( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); - const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm. /** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */ @@ -169,7 +163,6 @@ inline sal_Int32 convertEmuToHmm( sal_Int64 nValue ) } - /** A structure for a point with 64-bit integer components. */ struct EmuPoint { @@ -181,7 +174,6 @@ struct EmuPoint }; - /** A structure for a size with 64-bit integer components. */ struct EmuSize { @@ -193,7 +185,6 @@ struct EmuSize }; - /** A structure for a rectangle with 64-bit integer components. */ struct EmuRectangle : public EmuPoint, public EmuSize { @@ -205,7 +196,6 @@ struct EmuRectangle : public EmuPoint, public EmuSize }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 9f7115c2cf69..2cf6c6285a33 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -37,7 +37,6 @@ public: }; - class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext { public: @@ -52,7 +51,6 @@ private: }; - class OleObjectGraphicDataContext : public ShapeContext { public: @@ -65,7 +63,6 @@ private: }; - class Diagram; class DiagramGraphicDataContext @@ -84,7 +81,6 @@ private: }; - class ChartGraphicDataContext : public ShapeContext { public: @@ -102,7 +98,6 @@ private: }; - } } #endif // INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index abe5505d1740..e529dce39912 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -93,7 +93,6 @@ struct OOX_DLLPUBLIC ShapePropertyInfo }; - class OOX_DLLPUBLIC ShapePropertyMap : public PropertyMap { public: @@ -143,7 +142,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index 557e9a16248e..134167f3fdad 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -30,7 +30,6 @@ namespace oox { namespace drawingml { - const sal_Int32 THEMED_STYLE_SUBTLE = 1; const sal_Int32 THEMED_STYLE_MODERATE = 2; const sal_Int32 THEMED_STYLE_INTENSE = 3; @@ -102,7 +101,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index 4287778d3a9f..24ea7abb2d21 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -29,7 +29,6 @@ namespace drawingml { class Theme; - class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2 { public: @@ -46,7 +45,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 46dd050f62a1..2cde09d3e2c0 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -28,7 +28,6 @@ namespace oox { namespace dump { - class DffStreamObject : public SequenceRecordObjectBase { public: @@ -59,7 +58,6 @@ private: }; - } // namespace dump } // namespace oox diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 0f274356b834..4561720c31ee 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -62,7 +62,6 @@ namespace oox { namespace dump { - #define OOX_DUMP_UNUSED "unused" #define OOX_DUMP_UNKNOWN "?unknown" @@ -97,8 +96,6 @@ typedef ::std::vector< OUString > OUStringVector; typedef ::std::vector< sal_Int64 > Int64Vector; - - /** Static helper functions for system file and stream access. */ class InputOutputHelper { @@ -137,7 +134,6 @@ public: }; - class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef { public: @@ -155,8 +151,6 @@ public: }; - - /** Specifiers for atomic data types. */ enum DataType { @@ -174,7 +168,6 @@ enum DataType }; - /** Specifiers for the output format of values. */ enum FormatType { @@ -188,7 +181,6 @@ enum FormatType }; - /** Describes the output format of a data item. Data items are written in the following format: @@ -249,10 +241,6 @@ struct ItemFormat }; - - - - /** Static helper functions for formatted output to strings. */ class StringHelper { @@ -364,7 +352,6 @@ public: }; - template< typename Type > void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) { @@ -387,7 +374,6 @@ void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFm } - class String : public OUString { public: @@ -403,8 +389,6 @@ public: static const String EMPTY_STRING; - - class Base; /** Base class for all dumper classes. @@ -471,8 +455,6 @@ protected: }; - - class ConfigItemBase { public: @@ -510,7 +492,6 @@ private: }; - class SharedConfigData; class Config; @@ -600,7 +581,6 @@ private: }; - class ConstList : public NameListBase { public: @@ -632,7 +612,6 @@ private: }; - class MultiList : public ConstList { public: @@ -653,7 +632,6 @@ private: }; - class FlagsList : public NameListBase { public: @@ -684,7 +662,6 @@ private: }; - class CombiList : public FlagsList { public: @@ -717,7 +694,6 @@ private: }; - class UnitConverter : public NameListBase { public: @@ -742,7 +718,6 @@ private: }; - class NameListWrapper { public: @@ -762,7 +737,6 @@ private: static const NameListWrapper NO_LIST; - class ItemFormatMap { private: @@ -782,8 +756,6 @@ public: }; - - class SharedConfigData : public Base, public ConfigItemBase { public: @@ -841,7 +813,6 @@ private: }; - template< typename ListType > std::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) { @@ -863,7 +834,6 @@ void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rLi } - class Config : public Base { public: @@ -929,7 +899,6 @@ private: typedef std::shared_ptr< Config > ConfigRef; - template< typename Type > Type Config::getIntOption( const String& rKey, Type nDefault ) const { @@ -960,8 +929,6 @@ bool Config::hasName( const NameListWrapper& rListWrp, Type nKey ) const } - - class Output : public Base { public: @@ -970,7 +937,6 @@ public: const OUString& rFileName ); - void newLine(); void emptyLine( size_t nCount = 1 ); @@ -1047,7 +1013,6 @@ private: typedef std::shared_ptr< Output > OutputRef; - class IndentGuard { public: @@ -1061,7 +1026,6 @@ private: }; - class TableGuard { public: @@ -1084,7 +1048,6 @@ private: }; - class ItemGuard { public: @@ -1100,7 +1063,6 @@ private: }; - class MultiItemsGuard { public: @@ -1114,7 +1076,6 @@ private: }; - class StorageIterator : public Base { public: @@ -1137,8 +1098,6 @@ private: }; - - class ObjectBase : public Base { public: @@ -1160,7 +1119,6 @@ protected: virtual void implDump(); - Config& cfg() const { return *mxConfig; } private: @@ -1170,8 +1128,6 @@ private: typedef std::shared_ptr< ObjectBase > ObjectRef; - - class StorageObjectBase : public ObjectBase { protected: @@ -1242,9 +1198,6 @@ private: }; - - - class OutputObjectBase : public ObjectBase { public: @@ -1261,7 +1214,6 @@ protected: virtual bool implIsValid() const override; - void writeEmptyItem( const String& rName ); void writeInfoItem( const String& rName, const String& rData ); void writeCharItem( const String& rName, sal_Unicode cData ); @@ -1304,8 +1256,6 @@ protected: }; - - template< typename Type > void OutputObjectBase::addNameToItem( Type nData, const NameListWrapper& rListWrp ) { @@ -1412,8 +1362,6 @@ void OutputObjectBase::writeHexPairItem( const String& rName, Type nData1, Type } - - class InputObjectBase : public OutputObjectBase { public: @@ -1492,8 +1440,6 @@ protected: }; - - template< typename Type > Type InputObjectBase::dumpName( const String& rName, const NameListWrapper& rListWrp ) { @@ -1609,8 +1555,6 @@ void InputObjectBase::dumpHexPair( const String& rName, sal_Unicode cSep ) } - - class BinaryStreamObject : public InputObjectBase { public: @@ -1626,8 +1570,6 @@ protected: }; - - class TextStreamObjectBase : public InputObjectBase { protected: @@ -1657,7 +1599,6 @@ protected: }; - class TextLineStreamObject : public TextStreamObjectBase { public: @@ -1678,7 +1619,6 @@ protected: }; - class XmlStreamObject : public TextStreamObjectBase { public: @@ -1692,8 +1632,6 @@ protected: }; - - class RecordObjectBase : public InputObjectBase { protected: @@ -1739,7 +1677,6 @@ private: }; - class SequenceRecordObjectBase : public RecordObjectBase { protected: @@ -1762,8 +1699,6 @@ private: }; - - /** Base class for a file dumper. Derived classes implement the implDump() function to add functionality. */ @@ -1783,8 +1718,6 @@ protected: }; - - } // namespace dump } // namespace oox diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index ea9604dcc218..0edae384cb4d 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -33,8 +33,6 @@ namespace oox { namespace dump { - - class OleInputObjectBase : public InputObjectBase { protected: @@ -52,8 +50,6 @@ protected: }; - - class StdFontObject : public OleInputObjectBase { public: @@ -64,7 +60,6 @@ protected: }; - class StdPicObject : public OleInputObjectBase { public: @@ -75,8 +70,6 @@ protected: }; - - class OleStreamObject : public OleInputObjectBase { public: @@ -84,7 +77,6 @@ public: }; - class OleCompObjObject : public OleStreamObject { public: @@ -95,8 +87,6 @@ protected: }; - - class OlePropertyStreamObject : public InputObjectBase { public: @@ -136,7 +126,6 @@ private: }; - class OleStorageObject : public StorageObjectBase { public: @@ -156,8 +145,6 @@ protected: }; - - class ComCtlObjectBase : public OleInputObjectBase { protected: @@ -187,7 +174,6 @@ protected: }; - class ComCtlScrollBarObject : public ComCtlObjectBase { public: @@ -198,7 +184,6 @@ protected: }; - class ComCtlProgressBarObject : public ComCtlObjectBase { public: @@ -209,7 +194,6 @@ protected: }; - class ComCtlSliderObject : public ComCtlObjectBase { public: @@ -220,7 +204,6 @@ protected: }; - class ComCtlUpDownObject : public ComCtlObjectBase { public: @@ -231,7 +214,6 @@ protected: }; - class ComCtlImageListObject : public ComCtlObjectBase { public: @@ -244,7 +226,6 @@ protected: }; - class ComCtlTabStripObject : public ComCtlObjectBase { public: @@ -256,7 +237,6 @@ protected: }; - class ComCtlTreeViewObject : public ComCtlObjectBase { public: @@ -271,7 +251,6 @@ private: }; - class ComCtlStatusBarObject : public ComCtlObjectBase { public: @@ -284,8 +263,6 @@ protected: }; - - class AxPropertyObjectBase : public OleInputObjectBase { protected: @@ -395,7 +372,6 @@ private: }; - template< typename Type > void AxPropertyObjectBase::alignInput() { @@ -425,7 +401,6 @@ Type AxPropertyObjectBase::dumpHexProperty( Type nDefault, const NameListWrapper } - class AxCFontNewObject : public AxPropertyObjectBase { public: @@ -436,7 +411,6 @@ protected: }; - class AxColumnInfoObject : public AxPropertyObjectBase { public: @@ -447,7 +421,6 @@ protected: }; - class AxCommandButtonObject : public AxPropertyObjectBase { public: @@ -459,7 +432,6 @@ protected: }; - class AxMorphControlObject : public AxPropertyObjectBase { public: @@ -478,7 +450,6 @@ private: }; - class AxLabelObject : public AxPropertyObjectBase { public: @@ -490,7 +461,6 @@ protected: }; - class AxImageObject : public AxPropertyObjectBase { public: @@ -501,7 +471,6 @@ protected: }; - class AxScrollBarObject : public AxPropertyObjectBase { public: @@ -512,7 +481,6 @@ protected: }; - class AxSpinButtonObject : public AxPropertyObjectBase { public: @@ -523,7 +491,6 @@ protected: }; - class AxTabStripObject : public AxPropertyObjectBase { public: @@ -538,8 +505,6 @@ private: }; - - class FormControlStreamObject : public OleInputObjectBase { public: @@ -565,8 +530,6 @@ private: }; - - struct VbaFormSiteInfo { OUString maProgId; @@ -580,7 +543,6 @@ struct VbaFormSiteInfo typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; - struct VbaFormSharedData { OUStringVector maClassInfoProgIds; @@ -588,7 +550,6 @@ struct VbaFormSharedData }; - class VbaFormClassInfoObject : public AxPropertyObjectBase { public: @@ -602,7 +563,6 @@ private: }; - class VbaFormSiteObject : public AxPropertyObjectBase { public: @@ -616,7 +576,6 @@ private: }; - class VbaFormDesignExtObject : public AxPropertyObjectBase { public: @@ -627,7 +586,6 @@ protected: }; - class VbaFStreamObject : public AxPropertyObjectBase { public: @@ -653,7 +611,6 @@ private: }; - class VbaOStreamObject : public OleInputObjectBase { public: @@ -671,7 +628,6 @@ private: }; - class VbaPageObject : public AxPropertyObjectBase { public: @@ -682,7 +638,6 @@ protected: }; - class VbaMultiPageObject : public AxPropertyObjectBase { public: @@ -697,7 +652,6 @@ private: }; - class VbaXStreamObject : public InputObjectBase { public: @@ -715,7 +669,6 @@ private: }; - class VbaContainerStorageObject : public OleStorageObject { public: @@ -744,8 +697,6 @@ private: }; - - struct VbaSharedData { typedef ::std::map< OUString, sal_Int32 > StreamOffsetMap; @@ -760,7 +711,6 @@ struct VbaSharedData }; - class VbaDirStreamObject : public SequenceRecordObjectBase { public: @@ -789,7 +739,6 @@ private: }; - class VbaModuleStreamObject : public InputObjectBase { public: @@ -809,7 +758,6 @@ private: }; - class VbaStorageObject : public OleStorageObject { public: @@ -831,7 +779,6 @@ private: }; - class VbaFormStorageObject : public VbaContainerStorageObject { public: @@ -853,7 +800,6 @@ private: }; - class VbaProjectStorageObject : public OleStorageObject { public: @@ -876,8 +822,6 @@ private: }; - - class ActiveXStorageObject : public VbaContainerStorageObject { public: @@ -893,8 +837,6 @@ protected: }; - - } // namespace dump } // namespace oox diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 5390df05c0e7..9b0a14857b32 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -29,7 +29,6 @@ namespace dump { namespace pptx { - class RootStorageObject : public StorageObjectBase { public: @@ -44,7 +43,6 @@ protected: }; - class Dumper : public DumperBase { public: @@ -60,7 +58,6 @@ protected: }; - } // namespace pptx } // namespace dump } // namespace oox diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index a4651a1cabf5..1d8c28281249 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -36,7 +36,6 @@ namespace dump { namespace xlsb { - class RecordObjectBase : public SequenceRecordObjectBase { protected: @@ -55,7 +54,6 @@ private: }; - class RootStorageObject : public StorageObjectBase { public: @@ -70,7 +68,6 @@ protected: }; - class Dumper : public DumperBase { public: @@ -86,7 +83,6 @@ protected: }; - } // namespace xlsb } // namespace dump } // namespace oox diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index 427e4d63994b..2bde4a8807cc 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -34,7 +34,6 @@ namespace sax_fastparser { namespace oox { - /** Static helpers for conversion of strings to attribute values of various different data types. */ @@ -62,7 +61,6 @@ public: }; - /** Provides access to attribute values of an element. Wraps a com.sun.star.xml.sax.XFastAttributeList object. Provides @@ -170,7 +168,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 0e4b3134993e..fba55a0127c7 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -33,7 +33,6 @@ namespace oox { class BinaryOutputStream; - /** Interface for binary input stream classes. The binary data in the stream is assumed to be in little-endian format. @@ -211,7 +210,6 @@ private: typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef; - template< typename Type > Type BinaryInputStream::readValue() { @@ -242,7 +240,6 @@ sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int } - /** Wraps a UNO input stream and provides convenient access functions. The binary data in the stream is assumed to be in little-endian format. @@ -290,7 +287,6 @@ private: }; - /** Wraps a StreamDataSequence and provides convenient access functions. The binary data in the stream is assumed to be in little-endian format. @@ -326,7 +322,6 @@ private: }; - /** Wraps a BinaryInputStream and provides access to a specific part of the stream data. @@ -393,7 +388,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 0ed0d5e2bfce..486b4efa9d43 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Interface for binary output stream classes. The binary data in the stream is written in little-endian format. @@ -121,7 +120,6 @@ void BinaryOutputStream::writeValue( Type nValue ) } - /** Wraps a UNO output stream and provides convenient access functions. The binary data in the stream is written in little-endian format. @@ -163,7 +161,6 @@ private: }; - /** Wraps a StreamDataSequence and provides convenient access functions. The binary data in the stream is written in little-endian format. After @@ -190,7 +187,6 @@ public: }; - } // namespace oox #endif diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 8492049283ce..e49eca63c601 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -34,7 +34,6 @@ namespace oox { typedef css::uno::Sequence< sal_Int8 > StreamDataSequence; - /** Base class for binary stream classes. */ class OOX_DLLPUBLIC BinaryStreamBase @@ -118,7 +117,6 @@ private: }; - /** Base class for binary input and output streams wrapping a UNO stream, seekable via the com.sun.star.io.XSeekable interface. */ @@ -146,7 +144,6 @@ private: }; - /** Base class for binary input and output streams wrapping a StreamDataSequence, which is always seekable. @@ -175,7 +172,6 @@ protected: }; - } // namespace oox #endif diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 1c73eb7ec98d..66d098f869ce 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** A range of signed 32-bit integer values. */ struct ValueRange { @@ -55,11 +54,9 @@ struct ValueRange }; - typedef ::std::vector< ValueRange > ValueRangeVector; - /** An ordered list of value ranges. The insertion operation will merge consecutive value ranges. */ @@ -79,7 +76,6 @@ private: }; - /** Template for a 2-dimensional array of objects. This class template provides a similar interface to the ::std::vector @@ -136,7 +132,6 @@ private: }; - /** Static helper functions for improved API container handling. */ class OOX_DLLPUBLIC ContainerHelper { @@ -267,7 +262,6 @@ public: }; - template< typename VectorType > /*static*/ const typename VectorType::value_type* ContainerHelper::getVectorElement( const VectorType& rVector, sal_Int32 nIndex ) { @@ -325,7 +319,6 @@ template< typename MatrixType > } - } // namespace oox #endif diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index ce0b3655621a..36f374805c33 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -46,7 +46,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Provides helper functions for colors, device measurement conversion, graphics, and graphic objects handling. @@ -165,7 +164,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 5029d5fa1d26..30525a86c8b0 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -75,7 +75,6 @@ const sal_uInt8 WINDOWS_CHARSET_EASTERN = 238; const sal_uInt8 WINDOWS_CHARSET_OEM = 255; - const sal_Int32 API_RGB_TRANSPARENT = -1; ///< Transparent color for API calls. const sal_uInt32 UNSIGNED_RGB_TRANSPARENT = static_cast<sal_uInt32>(-1); ///< Transparent color for unsigned int32 places. const sal_Int32 API_RGB_BLACK = 0x000000; ///< Black color for API calls. @@ -101,7 +100,6 @@ const sal_Int8 API_ESCAPEHEIGHT_NONE = 100; ///< Relative character const sal_Int8 API_ESCAPEHEIGHT_DEFAULT = 58; ///< Relative character height if escaped. - // Limitate values ------------------------------------------------------------ template< typename ReturnType, typename Type > @@ -167,7 +165,6 @@ inline void setFlag( Type& ornBitField, Type nMask, bool bSet = true ) } - /** Optional value, similar to ::boost::optional<>, with convenience accessors. */ template< typename Type > @@ -201,7 +198,6 @@ private: }; - /** Provides platform independent functions to convert from or to little-endian byte order, e.g. for reading data from or writing data to memory or a binary stream. @@ -261,7 +257,6 @@ private: }; - template< typename Type > inline void ByteOrderConverter::writeLittleEndian( void* pDstBuffer, Type nValue ) { @@ -298,7 +293,6 @@ inline void ByteOrderConverter::swap8( sal_uInt8* pnData ) #endif - } // namespace oox #endif diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 1f530fd6af48..85ce16808a7b 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -34,7 +34,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** This helper manages named objects in a container, which is created on demand. */ class OOX_DLLPUBLIC ObjectContainer @@ -69,7 +68,6 @@ private: }; - /** Contains tables for named drawing objects for a document model. Contains tables for named line markers, line dashes, fill gradients, and @@ -121,7 +119,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index faabe22bec2b..2ee50a376426 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -57,8 +57,6 @@ public: }; - - class ISegmentProgressBar; typedef std::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; @@ -78,8 +76,6 @@ public: }; - - /** A simple progress bar. */ class OOX_DLLPUBLIC ProgressBar : public IProgressBar @@ -103,7 +99,6 @@ private: }; - /** A progress bar containing several independent segments. */ class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar @@ -129,7 +124,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx index 99412d145687..aa6696b0248e 100644 --- a/include/oox/helper/propertymap.hxx +++ b/include/oox/helper/propertymap.hxx @@ -38,7 +38,6 @@ namespace oox { struct PropertyNameVector; - typedef ::std::map< sal_Int32, css::uno::Any > PropertyMapType; typedef ::std::map< OUString, css::uno::Any > PropertyNameMap; @@ -118,7 +117,6 @@ protected: }; - } // namespace oox #endif diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index db1a5aa83226..669472a07b6d 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -30,7 +30,6 @@ namespace oox { class PropertyMap; - /** A wrapper for a UNO property set. This class provides functions to silently get and set properties (without @@ -138,7 +137,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index 1a40634fa117..342854f050c8 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -29,7 +29,6 @@ namespace oox { - /** Template for a map of ref-counted objects with additional accessor functions. An instance of the class RefMap< Type > stores elements of the type @@ -139,7 +138,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index eff649b718b0..68b41f626eb6 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -29,7 +29,6 @@ namespace oox { - /** Template for a vector of ref-counted objects with additional accessor functions. An instance of the class RefVector< Type > stores elements of the type @@ -153,7 +152,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index c1264d9eb11b..b953495fb094 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace oox { - class StorageBase; typedef std::shared_ptr< StorageBase > StorageRef; @@ -183,7 +182,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx index 71018569c154..8412b77a53ba 100644 --- a/include/oox/helper/textinputstream.hxx +++ b/include/oox/helper/textinputstream.hxx @@ -34,7 +34,6 @@ namespace oox { class BinaryInputStream; - class TextInputStream { public: @@ -88,7 +87,6 @@ public: OUString readToChar( sal_Unicode cChar, bool bIncludeChar ); - /** Creates a UNO text input stream object from the passed UNO input stream. */ static css::uno::Reference< css::io::XTextInputStream2 > @@ -114,7 +112,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index 9b5328f74560..4e4236393cbd 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Implements stream access for ZIP storages containing XML streams. */ class ZipStorage : public StorageBase { @@ -80,7 +79,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 7a14865e8544..9ee055b30e68 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - /** A wrapper for a binary input stream that supports aligned read operations. The implementation does not support seeking back the wrapped stream. All @@ -83,7 +82,6 @@ private: }; - /** A pair of integer values as a property. */ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; @@ -91,7 +89,6 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; typedef ::std::vector< OUString > AxArrayString; - /** Import helper to read simple and complex ActiveX form control properties from a binary input stream. */ class AxBinaryPropertyReader @@ -243,7 +240,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index befbf22bfdc2..89a0201f52ac 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -46,7 +46,6 @@ namespace oox { namespace ole { - #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}" #define COMCTL_GUID_PROGRESSBAR_60 "{35053A22-8589-11D1-B16A-00C0F0283628}" @@ -55,7 +54,6 @@ const sal_uInt16 COMCTL_VERSION_50 = 5; const sal_uInt16 COMCTL_VERSION_60 = 6; - #define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-a777-00dd01143c57}" #define AX_GUID_LABEL "{978C9E23-D4B0-11CE-bf2d-00aa003f40d0}" #define AX_GUID_IMAGE "{4C599241-6926-101B-9992-00000b65c6f9}" @@ -142,7 +140,6 @@ const sal_Int32 AX_SCROLLBAR_HORIZONTAL = 0x01; const sal_Int32 AX_SCROLLBAR_VERTICAL = 0x02; - /** Enumerates all UNO API control types supported by these filters. */ enum ApiControlType { @@ -167,7 +164,6 @@ enum ApiControlType }; - /** Specifies how a form control supports transparent background. */ enum ApiTransparencyMode { @@ -185,7 +181,6 @@ enum ApiDefaultStateMode }; - /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. */ @@ -345,7 +340,6 @@ private: }; - /** Base class for all models of form controls. */ class OOX_DLLPUBLIC ControlModelBase { @@ -392,7 +386,6 @@ protected: typedef std::shared_ptr< ControlModelBase > ControlModelRef; - /** Base class for all models of ComCtl form controls. */ class ComCtlModelBase : public ControlModelBase { @@ -434,7 +427,6 @@ private: }; - /** Model for a ComCtl scroll bar. */ class ComCtlScrollBarModel : public ComCtlModelBase { @@ -457,7 +449,6 @@ private: }; - /** Model for a ComCtl progress bar. */ class ComCtlProgressBarModel : public ComCtlModelBase { @@ -478,7 +469,6 @@ private: }; - /** Base class for all models of Form 2.0 form controls. */ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase { @@ -489,7 +479,6 @@ public: }; - /** Base class for Forms 2.0 controls supporting text formatting. */ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase { @@ -513,7 +502,6 @@ private: }; - /** Model for a Forms 2.0 command button. */ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel { @@ -542,7 +530,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 label. */ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel { @@ -570,7 +557,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 image. */ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase { @@ -617,7 +603,6 @@ public: }; - /** Base class for a Forms 2.0 morph data control. */ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel { @@ -654,7 +639,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 toggle button. */ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase { @@ -668,7 +652,6 @@ public: }; - /** Model for a Forms 2.0 check box. */ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase { @@ -682,7 +665,6 @@ public: }; - /** Model for a Forms 2.0 option button. */ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase { @@ -699,7 +681,6 @@ public: }; - /** Model for a Forms 2.0 text box. */ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase { @@ -713,7 +694,6 @@ public: }; - /** Model for a numeric field (legacy drawing controls only). */ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase { @@ -727,7 +707,6 @@ public: }; - /** Model for a Forms 2.0 list box. */ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase { @@ -741,7 +720,6 @@ public: }; - /** Model for a Forms 2.0 combo box. */ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase { @@ -755,7 +733,6 @@ public: }; - /** Model for a Forms 2.0 spin button. */ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase { @@ -784,7 +761,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 scroll bar. */ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase { @@ -815,7 +791,6 @@ public: // direct access needed for legacy VML drawing controls }; - typedef ::std::vector< OUString > AxClassTable; /** Base class for ActiveX container controls. */ @@ -856,8 +831,6 @@ public: // direct access needed for legacy VML drawing controls }; - - /** Model for a Forms 2.0 frame control. */ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase { @@ -891,8 +864,6 @@ public: }; - - /** Model for a Forms 2.0 user form. */ class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase { @@ -966,7 +937,6 @@ private: }; - template< typename ModelType > inline ModelType& EmbeddedControl::createModel() { @@ -986,7 +956,6 @@ inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) } - /** A wrapper for a control form embedded directly in a draw page. */ class EmbeddedForm { @@ -1019,7 +988,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 7964e55225cd..b4284cf892e7 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -29,7 +29,6 @@ class ControlModelBase; class EmbeddedControl; - /** Context handler for ActiveX form control model properties. */ class AxControlPropertyContext : public ::oox::core::ContextHandler2 { @@ -47,7 +46,6 @@ private: }; - /** Fragment handler for an embedded ActiveX form control fragment. */ class AxControlFragment : public ::oox::core::FragmentHandler2 { @@ -65,7 +63,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index c8e764e997cc..05694fbcd12e 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - const sal_Char* const AX_GUID_CFONT = "{AFC20920-DA4E-11CE-B943-00AA006887B4}"; const sal_uInt32 AX_FONTDATA_BOLD = 0x00000001; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 12ae732ebf6c..0a6ba4a76302 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -56,13 +56,10 @@ namespace oox { namespace ole { - - #define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDPIC "{0BE35204-8F91-11CE-9DE3-00AA004BB851}" - const sal_uInt16 OLE_STDFONT_NORMAL = 400; const sal_uInt16 OLE_STDFONT_BOLD = 700; @@ -89,7 +86,6 @@ struct StdFontInfo }; - /** Stores data about a StdHlink hyperlink. */ struct StdHlinkInfo { @@ -99,7 +95,6 @@ struct StdHlinkInfo }; - /** Static helper functions for OLE import/export. */ namespace OleHelper { @@ -170,8 +165,6 @@ public: }; - - } // namespace ole } // namespace oox diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index 35e16b05add6..5b9ae97dc38e 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -36,7 +36,6 @@ namespace oox { namespace ole { - /** Contains generic information about an OLE object. */ struct OOX_DLLPUBLIC OleObjectInfo { @@ -51,7 +50,6 @@ struct OOX_DLLPUBLIC OleObjectInfo }; - /** Helper for OLE object handling. */ class OleObjectHelper { diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 6b00ada1b61a..9039cae2dedb 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -31,7 +31,6 @@ namespace oox { namespace ole { - /** Implements stream access for binary OLE storages. */ class OOX_DLLPUBLIC OleStorage : public StorageBase { @@ -101,7 +100,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index a17513c9f383..0e914df83ea3 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -34,7 +34,6 @@ namespace oox { namespace ole { - /** Common properties for all controls that are part of a VBA user form or of another container control in a VBA user form. */ class VbaSiteModel @@ -95,7 +94,6 @@ protected: typedef std::shared_ptr< VbaSiteModel > VbaSiteModelRef; - /** A control that is embedded in a VBA user form or in another container control in a VBA user form. @@ -172,7 +170,6 @@ private: }; - class VbaUserForm : public VbaFormControl { public: @@ -197,7 +194,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx index 75ad1b57e1a9..94a63efe34a8 100644 --- a/include/oox/ole/vbahelper.hxx +++ b/include/oox/ole/vbahelper.hxx @@ -50,7 +50,6 @@ const sal_uInt16 VBA_ID_PROJECTNAME = 0x0004; const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; - /** Static helper functions for the VBA filters. */ namespace VbaHelper { @@ -84,7 +83,6 @@ namespace VbaHelper } - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index 393f517c06b4..dd6e53ad6a9a 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -27,7 +27,6 @@ namespace oox { namespace ole { - /** A non-seekable input stream that implements run-length decompression. */ class VbaInputStream : public BinaryInputStream { @@ -65,7 +64,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 9fa2de0408fe..68aef13e82e1 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -39,7 +39,6 @@ namespace oox { namespace ole { - class VbaModule { public: @@ -100,7 +99,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 9478c9adde96..e4ed68255bdb 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -42,7 +42,6 @@ namespace oox { namespace ole { - class OOX_DLLPUBLIC VbaFilterConfig { public: @@ -64,7 +63,6 @@ private: }; - /** Base class for objects that attach a macro to a specific action. Purpose is to collect objects that need to attach a VBA macro to an action. @@ -105,7 +103,6 @@ private: typedef std::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; - class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig { public: @@ -204,7 +201,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx index c4165a1abe06..cbf0070f325f 100644 --- a/include/oox/ppt/animationspersist.hxx +++ b/include/oox/ppt/animationspersist.hxx @@ -120,9 +120,6 @@ namespace oox { namespace ppt { } } - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index c1106ef23f38..4df7a3081e49 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -26,7 +26,6 @@ namespace oox { namespace ppt { - class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 { public: diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 531ab6c2dea8..7272eeeb8c4e 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class QuickDiagrammingImport : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 9dcd8ae6fda9..0ba4d53ae5b2 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class QuickDiagrammingLayout : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 9908177ea9f4..125030381f70 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class PowerPointImport : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx index 4b3bd9fee30b..51e0e0da0890 100644 --- a/include/oox/ppt/soundactioncontext.hxx +++ b/include/oox/ppt/soundactioncontext.hxx @@ -47,7 +47,6 @@ private: } } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index af0d6f6cba07..5406771013fd 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -43,7 +43,6 @@ namespace oox { namespace ppt { }; - /** FastParser context for XML_tnLst, XML_subTnLst and XML_childTnLst */ class TimeNodeListContext : public ::oox::core::FragmentHandler2 { diff --git a/include/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx index 46c89d658b80..a17e8cc98ff6 100644 --- a/include/oox/token/namespacemap.hxx +++ b/include/oox/token/namespacemap.hxx @@ -27,7 +27,6 @@ namespace oox { - /** A map that contains all XML namespace URLs used in the filters. */ struct NamespaceMap { @@ -44,7 +43,6 @@ struct NamespaceMap struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {}; - } // namespace oox #endif diff --git a/include/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx index 3d0c8db6134c..6419b57f70c1 100644 --- a/include/oox/token/propertynames.hxx +++ b/include/oox/token/propertynames.hxx @@ -27,7 +27,6 @@ namespace oox { - /** A vector that contains all predefined property names used in the filters. */ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); }; @@ -35,7 +34,6 @@ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVecto struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {}; - } // namespace oox #endif diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index 686b8316284c..83ce4cfa5d96 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -30,7 +30,6 @@ namespace oox { - class TokenMap { public: @@ -82,11 +81,9 @@ private: }; - struct StaticTokenMap : public ::rtl::Static< TokenMap, StaticTokenMap > {}; - } // namespace oox #endif diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index ad34652a1d79..ad1462a812eb 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -48,7 +48,6 @@ class ShapeBase; struct ClientData; - /** Enumerates different types of VML drawings. */ enum DrawingType { @@ -58,7 +57,6 @@ enum DrawingType }; - /** Contains information about an OLE object embedded in a draw page. */ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo { @@ -89,7 +87,6 @@ struct OOX_DLLPUBLIC ControlInfo }; - /** Represents the collection of VML shapes for a complete draw page. */ class OOX_DLLPUBLIC Drawing { @@ -202,7 +199,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index 7e0d4c474a46..c2e82d4aae71 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -29,7 +29,6 @@ namespace vml { class Drawing; - class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2 { public: @@ -51,7 +50,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index 8df59acf4eaf..2e212a52eb6f 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -38,12 +38,10 @@ namespace oox { namespace vml { - typedef ::std::pair< sal_Int32, sal_Int32 > Int32Pair; typedef ::std::pair< double, double > DoublePair; - namespace ConversionHelper { /** Returns two values contained in rValue separated by cSep. @@ -158,7 +156,6 @@ namespace ConversionHelper } - /** The stroke arrow model structure contains all properties for an line end arrow. */ struct StrokeArrowModel { @@ -170,7 +167,6 @@ struct StrokeArrowModel }; - /** The stroke model structure contains all shape border properties. */ struct StrokeModel { @@ -194,7 +190,6 @@ struct StrokeModel }; - /** The fill model structure contains all shape fill properties. */ struct OOX_DLLPUBLIC FillModel { @@ -220,7 +215,6 @@ struct OOX_DLLPUBLIC FillModel }; - /** The shadow model structure contains all shape shadow properties. */ struct OOX_DLLPUBLIC ShadowModel { diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index 0197cff6278e..4fc6dc9e9fc9 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -33,7 +33,6 @@ namespace oox { namespace vml { - /** An input stream class for VML streams, implementing the UNO interface com.sun.star.io.XInputStream needed by the Expat XML parsers. @@ -87,7 +86,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 18076c6dbc2a..cb6c05353d9a 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -41,7 +41,6 @@ struct ShapeParentAnchor; class ShapeContainer; - const sal_Int32 VML_CLIENTDATA_UNCHECKED = 0; const sal_Int32 VML_CLIENTDATA_CHECKED = 1; const sal_Int32 VML_CLIENTDATA_MIXED = 2; @@ -53,7 +52,6 @@ const sal_Int32 VML_CLIENTDATA_REFERENCE = 3; const sal_Int32 VML_CLIENTDATA_FORMULA = 4; - /** The shape model structure contains all properties shared by all types of shapes. */ struct OOX_DLLPUBLIC ShapeTypeModel { @@ -116,7 +114,6 @@ struct OOX_DLLPUBLIC ShapeTypeModel }; - /** A shape template contains all formatting properties of shapes and can serve as templates for several shapes in a drawing. */ class ShapeType @@ -155,7 +152,6 @@ protected: }; - /** Excel specific shape client data (such as cell anchor). */ struct ClientData { @@ -193,7 +189,6 @@ struct ClientData }; - struct ShapeModel { typedef ::std::vector< css::awt::Point > PointVector; @@ -221,7 +216,6 @@ struct ShapeModel }; - /** A shape object that is part of a drawing. May inherit properties from a shape template. */ class OOX_DLLPUBLIC ShapeBase : public ShapeType @@ -282,7 +276,6 @@ protected: }; - /** A simple shape object based on a specific UNO shape service. */ class SimpleShape : public ShapeBase { @@ -307,7 +300,6 @@ private: }; - /** A rectangular shape object. */ class RectangleShape : public SimpleShape { @@ -322,7 +314,6 @@ protected: }; - /** An oval shape object. */ class EllipseShape : public SimpleShape { @@ -331,7 +322,6 @@ public: }; - /** A polygon shape object. */ class PolyLineShape : public SimpleShape { @@ -375,7 +365,6 @@ protected: }; - /** A shape object with custom geometry. */ class CustomShape : public SimpleShape { @@ -391,7 +380,6 @@ protected: }; - /** A complex shape object. This can be a picture shape, a custom shape, an OLE object, or an ActiveX form control. */ class ComplexShape : public CustomShape @@ -408,7 +396,6 @@ protected: }; - /** A group shape that extends the basic shape by a container of child shapes. */ class GroupShape : public ShapeBase { @@ -442,7 +429,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index b843c4d73f00..9f99f3974b12 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -37,7 +37,6 @@ class ShapeType; class ShapeBase; - struct ShapeParentAnchor { css::awt::Rectangle maShapeRect; @@ -45,7 +44,6 @@ struct ShapeParentAnchor }; - /** Container that holds a list of shapes and shape templates. */ class ShapeContainer { @@ -118,7 +116,6 @@ private: }; - template< typename ShapeT > ShapeT& ShapeContainer::createShape() { @@ -134,7 +131,6 @@ const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const } - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index 194a66c600aa..4636b0fdbc5c 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -39,7 +39,6 @@ class RectangleShape; class ShapeContainer; - class ShapeLayoutContext : public ::oox::core::ContextHandler2 { public: @@ -55,7 +54,6 @@ private: }; - class ClientDataContext : public ::oox::core::ContextHandler2 { public: @@ -75,7 +73,6 @@ private: }; - class ShapeContextBase : public ::oox::core::ContextHandler2 { public: @@ -91,7 +88,6 @@ protected: }; - class ShapeTypeContext : public ShapeContextBase { public: @@ -115,7 +111,6 @@ private: }; - class ShapeContext : public ShapeTypeContext { public: @@ -149,7 +144,6 @@ private: }; - class GroupShapeContext : public ShapeContext { public: @@ -166,7 +160,6 @@ private: }; - class RectangleShapeContext : public ShapeContext { public: diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index 1aa06db3f484..1c7ff8e2db3c 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -36,7 +36,6 @@ namespace vml { struct ShapeTypeModel; - /// A text paragraph in a textbox. struct TextParagraphModel { @@ -60,7 +59,6 @@ struct OOX_DLLPUBLIC TextFontModel }; - /** A text portion in a textbox with the same formatting for all characters. */ struct TextPortionModel { @@ -72,7 +70,6 @@ struct TextPortionModel }; - /** The textbox contains all text contents and properties. */ class OOX_DLLPUBLIC TextBox { @@ -104,7 +101,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx index 770a6f015861..7d90e43e1c3a 100644 --- a/include/oox/vml/vmltextboxcontext.hxx +++ b/include/oox/vml/vmltextboxcontext.hxx @@ -29,7 +29,6 @@ namespace oox { namespace vml { - class TextPortionContext : public ::oox::core::ContextHandler2 { public: @@ -55,7 +54,6 @@ private: }; - class TextBoxContext : public ::oox::core::ContextHandler2 { public: @@ -76,7 +74,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/osl/file.hxx b/include/osl/file.hxx index 87d11fb3206d..05689e538221 100644 --- a/include/osl/file.hxx +++ b/include/osl/file.hxx @@ -41,7 +41,6 @@ namespace osl { - /** Base class for all File System specific objects. @see Directory @@ -322,7 +321,6 @@ public: }; - /** The VolumeDevice class. @see VolumeInfo @@ -400,7 +398,6 @@ public: }; - class Directory; /** The VolumeInfo class. @@ -897,7 +894,6 @@ public: }; - /** The file class object provides access to file contents and attributes. @see Directory @@ -1605,7 +1601,6 @@ public: }; - /** Base class for observers of directory creation notifications. Clients which uses the method createDirectoryPath of the class diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx index 380ef3f840c3..b4012cca76f8 100644 --- a/include/osl/socket.hxx +++ b/include/osl/socket.hxx @@ -437,7 +437,6 @@ namespace osl } - inline sal_Int32 StreamSocket::recv(void* pBuffer, sal_uInt32 BytesToRead, oslSocketMsgFlag Flag) diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx index facad546ba4a..1913956da191 100644 --- a/include/osl/socket_decl.hxx +++ b/include/osl/socket_decl.hxx @@ -651,7 +651,6 @@ namespace osl }; - /** A connectionless socket to send and receive datagrams. */ class DatagramSocket : public Socket diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index dbbe0f1eab8a..71e35e0a635b 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -81,7 +81,6 @@ REG_DLLPUBLIC Registry_Api* REGISTRY_CALLTYPE initRegistry_Api(); class RegistryKey; - /** The Registry provides the functionality to read and write information in a registry file. The class is implemented inline and use a C-Api. @@ -185,8 +184,6 @@ protected: }; - - /** RegistryKeyArray represents an array of open keys. RegistryKeyArray is a helper class to work with an array of keys. @@ -263,7 +260,6 @@ protected: }; - /** RegistryValueList represents a value list of the specified type. RegistryValueList is a helper class to work with a list value. @@ -337,7 +333,6 @@ protected: }; - /** RegistryKey reads or writes information of the underlying key in a registry. Class is inline and use a load on call C-Api. @@ -599,8 +594,6 @@ protected: }; - - inline RegistryKeyArray::RegistryKeyArray() : m_length(0) , m_phKeys(nullptr) @@ -1022,7 +1015,6 @@ inline rtl::OUString RegistryKey::getRegistryName() } - inline Registry::Registry() : m_pApi(initRegistry_Api()) , m_hImpl(nullptr) diff --git a/include/salhelper/condition.hxx b/include/salhelper/condition.hxx index 65983cc32ac2..499f3b86f7d1 100644 --- a/include/salhelper/condition.hxx +++ b/include/salhelper/condition.hxx @@ -58,7 +58,6 @@ namespace salhelper }; - class SALHELPER_DLLPUBLIC ConditionModifier { public: @@ -76,7 +75,6 @@ namespace salhelper }; - class SALHELPER_DLLPUBLIC ConditionWaiter { public: diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx index 2eee3935f016..c1535334fb2c 100644 --- a/include/salhelper/refobj.hxx +++ b/include/salhelper/refobj.hxx @@ -90,7 +90,6 @@ protected: }; - } // namespace salhelper #endif /* ! INCLUDED_SALHELPER_REFOBJ_HXX */ diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx index 84064be2a0ce..c552c80b6f96 100644 --- a/include/salhelper/singletonref.hxx +++ b/include/salhelper/singletonref.hxx @@ -85,7 +85,6 @@ class SingletonRef public: - /** @short standard ctor. The internal wrapped object is created only, @@ -109,7 +108,6 @@ class SingletonRef } - /** @short standard dtor. The internal wrapped object is removed only, @@ -134,7 +132,6 @@ class SingletonRef } - /** @short Allows rSingle->someBodyOp(). */ SingletonClass* operator->() const @@ -146,7 +143,6 @@ class SingletonRef } - /** @short Allows (*rSingle).someBodyOp(). */ SingletonClass& operator*() const @@ -163,7 +159,6 @@ class SingletonRef private: - /** @short creates an own mutex for guarding static contents. The global mutex the osl library is used one times diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx index d73091739dd4..fc4134c4df12 100644 --- a/include/sax/fastparser.hxx +++ b/include/sax/fastparser.hxx @@ -38,7 +38,6 @@ class XFastTokenHandler; namespace sax_fastparser { - class FastSaxParserImpl; // This class implements the external Parser interface diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index a01b9d114a1f..d56e7f26aba8 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -34,11 +34,9 @@ #include <svtools/ctrlbox.hxx> - namespace sfx { - /** List position type of VCL ListBox. */ typedef sal_uInt16 ListBoxPosType; /** List position type of SVTOOLS ValueSet. */ @@ -212,7 +210,6 @@ private: }; - /** A dummy wrapper for a VCL Window that does nothing special. This wrapper is used to implement the DummyItemConnection. It does not @@ -233,7 +230,6 @@ public: }; - /** A wrapper for the VCL CheckBox. */ class SFX2_DLLPUBLIC CheckBoxWrapper: public SingleControlWrapper< CheckBox, bool > @@ -249,7 +245,6 @@ public: }; - /** A wrapper for the SVTOOLS ColorListBox. */ class SFX2_DLLPUBLIC ColorListBoxWrapper: public SingleControlWrapper< ColorListBox, Color > @@ -270,7 +265,6 @@ public: }; - /** A wrapper for the VCL NumericField. */ template< typename ValueT > class NumericFieldWrapper : public SingleControlWrapper< NumericField, ValueT > @@ -287,11 +281,6 @@ public: }; - - - - - /** A wrapper for the VCL MetricField. Adds support for field units during accessing the control value. The @@ -316,8 +305,6 @@ private: }; - - #define WRAPPER_LISTBOX_ENTRY_NOTFOUND 0xFFFF /* XXX was value of LISTBOX_ENTRY_NOTFOUND */ /** A wrapper for the VCL ListBox. @@ -351,11 +338,6 @@ public: }; - - - - - #define WRAPPER_VALUESET_ITEM_NOTFOUND 0xFFFF /* XXX was value of VALUESET_ITEM_NOTFOUND */ /** A wrapper for the SVTOOLS ValueSet. @@ -389,10 +371,6 @@ public: }; - - - - // Multi control wrappers @@ -428,7 +406,6 @@ private: }; - /** A multi control wrapper with extended interface. This template class extends the MultiControlWrapperHelper class by the @@ -465,13 +442,9 @@ private: }; - - - // *** Implementation of template functions *** - // Helpers @@ -525,7 +498,6 @@ inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eE } - template< typename ValueT > bool NumericFieldWrapper< ValueT >::IsControlDontKnow() const { @@ -552,7 +524,6 @@ void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const { @@ -579,7 +550,6 @@ void MetricFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > ValueT ListBoxWrapper< ValueT >::GetControlValue() const { @@ -595,7 +565,6 @@ void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue ) } - template< typename ValueT > ValueT ValueSetWrapper< ValueT >::GetControlValue() const { @@ -611,8 +580,6 @@ void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue ) } - - } // namespace sfx #endif diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index c333c94cf972..45c4fcc45578 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -84,7 +84,6 @@ public: }; - class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem { SfxControllerItem* pMaster; diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 2a9efc8429a6..e605444f0f99 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -35,7 +35,6 @@ namespace sfx2 { - //= IMacroDocumentAccess /** provides access to several settings of a document, which are needed by ->DocumentMacroMode diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index e2ec5b47cc6b..4a4374d4a4e4 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -33,7 +33,6 @@ namespace sfx2 { - //= IModifiableDocument /** callback for the DocumentStorageModifyListener class diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 079a13aafc54..37a71b338015 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -34,7 +34,6 @@ class SfxObjectShell; - class SFX2_DLLPUBLIC SfxEventHint : public SfxHint { SfxObjectShell* pObjShell; @@ -59,7 +58,6 @@ public: }; - class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint { css::uno::Reference< css::frame::XController2 > xViewController; diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 7b4af17d661c..98d231d02ac1 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -90,7 +90,6 @@ public: }; - #define PROP_EVENT_TYPE "EventType" #define PROP_LIBRARY "Library" #define PROP_SCRIPT "Script" diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 72de247b5090..c486aecf5cc4 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -206,7 +206,6 @@ public: }; - class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem { SfxFrame* pFrame; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index b836bf41ca58..005aa3771f4e 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -37,7 +37,6 @@ class SfxObjectShell; class Fraction; - class SFX2_DLLPUBLIC SfxInPlaceClient { friend class SfxInPlaceClient_Impl; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 0b50975c6ba5..965fda5caa90 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -213,7 +213,6 @@ private: }; - /** Base class template for single item <-> single control connection objects. This template uses functions provided by the SingleItemWrapper and the @@ -290,7 +289,6 @@ private: }; - /** Connection between an SfxBoolItem and a VCL CheckBox. */ typedef ItemControlConnection< BoolItemWrapper, CheckBoxWrapper > CheckBoxConnection; diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 92ac1a05fb7f..64fbf6d22824 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -28,7 +28,6 @@ #include <svl/itemset.hxx> - namespace sfx { @@ -118,7 +117,6 @@ private: }; - /** An item wrapper usable for most types of items. The item type must support the following functions: @@ -145,13 +143,11 @@ public: }; - typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper; typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; - /** An item wrapper that uses the item itself as value. */ template< typename ItemT > class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& > @@ -169,13 +165,9 @@ public: }; - - - // *** Implementation of template functions *** - // Item wrappers @@ -192,7 +184,6 @@ const ItemT& SingleItemWrapper< ItemT, ValueT >::GetDefaultItem( const SfxItemSe } - } // namespace sfx #endif diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 2adb619d9f28..63afcedb9ffd 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -63,7 +63,6 @@ public: }; - class SAL_DLLPUBLIC_EXPORT SfxPopupMenuManager : public SfxMenuManager { private: diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 30312b97f5b9..edb80ffd2f8f 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -101,7 +101,6 @@ enum SfxSlotKind }; - struct SfxTypeAttrib { sal_uInt16 nAID; @@ -216,7 +215,6 @@ struct SfxFormalArgument }; - class SfxSlot { public: @@ -269,7 +267,6 @@ public: }; - // returns the id of the function inline sal_uInt16 SfxSlot::GetSlotId() const diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx index 4308418ac1b2..7ea00d1fe75c 100644 --- a/include/sfx2/msgpool.hxx +++ b/include/sfx2/msgpool.hxx @@ -65,7 +65,6 @@ public: }; - // seeks to the first func in the current group inline const SfxSlot* SfxSlotPool::FirstSlot() diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index 8c02ba274928..56a7c2f865a8 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -30,12 +30,10 @@ #include <o3tl/typed_flags_set.hxx> - class SfxObjectShellLock; class SfxObjectShell; - #define SFXWB_PREVIEW 0x0003 #define SFXWB_LOAD_TEMPLATE 0x0004 diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index d7c1b764d04a..5de7805a1927 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -90,7 +90,6 @@ public: }; - // returns the number of functions in this cluster inline sal_uInt16 SfxInterface::Count() const @@ -99,7 +98,6 @@ inline sal_uInt16 SfxInterface::Count() const } - // returns a function by position in the array inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index db4139285f44..b07478c318ef 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -26,7 +26,6 @@ #include <sfx2/shell.hxx> - class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem { SfxShell* _pSh; diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 675d5711e8ce..289d57dc65f2 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -30,7 +30,6 @@ class SfxViewShell; - struct SfxPrintOptDlg_Impl; class SfxPrintOptionsDialog : public ModalDialog { diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 13c52aa831e4..99f42dcab468 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -56,7 +56,6 @@ private: SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet ); - public: SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, SfxItemPool &rPool ); diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index cc0eb949913e..cfb28f1443b8 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -25,7 +25,6 @@ #include <memory> - struct SfxSecurityPage_Impl; class SfxSecurityPage : public SfxTabPage diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 834443fecff2..638d9e8f1e75 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -241,7 +241,6 @@ public: virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override ; - // XStarBasicAccess @@ -272,7 +271,6 @@ public: throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; - // XChild @@ -428,8 +426,6 @@ public: throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - - // XLoadable @@ -545,7 +541,6 @@ public: throw (css::uno::RuntimeException, std::exception) override; - // XEventsSupplier @@ -558,7 +553,6 @@ public: virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) override; - // XEmbeddedScripts @@ -661,7 +655,6 @@ public: virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; - // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index a4c823c0e87d..15e642884722 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -271,7 +271,6 @@ private: }; - } } // end of namespace sfx2::sidebar #endif diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 43eb733a249d..8ec6cc13ae10 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -52,7 +52,6 @@ struct SfxStbCtrlFactory }; - class CommandEvent; class MouseEvent; class UserDrawEvent; @@ -120,7 +119,6 @@ public: }; - #define SFX_DECL_STATUSBAR_CONTROL() \ static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=nullptr) diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 54462aafd34c..737e5330802e 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -35,7 +35,6 @@ namespace sfx2 { - //= UserInputInterception struct UserInputInterception_Data; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 8814f085fb80..a9bc3f3347ea 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -282,7 +282,6 @@ private: }; - class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem { SfxViewFrame* pFrame; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index b3331964229d..4008800c69fb 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -89,7 +89,6 @@ namespace o3tl #define DEFAULT_MARGIN_HEIGHT 12 - // @[SfxViewShell-Flags] enum class SfxViewShellFlags @@ -113,7 +112,6 @@ namespace o3tl */ - #define SFX_DECL_VIEWFACTORY(Class) \ private: \ static SfxViewFactory *pFactory; \ @@ -330,7 +328,6 @@ public: }; - inline SfxViewFrame* SfxViewShell::GetViewFrame() const /* [Description] diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index d595b7ec24d9..84632ea96643 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -80,7 +80,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/store/store.hxx b/include/store/store.hxx index c42a34d4e60e..3d097748badb 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -359,6 +359,4 @@ private: #endif /* ! INCLUDED_STORE_STORE_HXX */ - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index 8d1e04bdb267..184cb4ca9847 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -62,7 +62,6 @@ public: }; - #endif // INCLUDED_SVL_CNTWALL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/converter.hxx b/include/svl/converter.hxx index 82d22154b66a..0aeceeac2132 100644 --- a/include/svl/converter.hxx +++ b/include/svl/converter.hxx @@ -31,5 +31,4 @@ public: #endif //_CONVERTER_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index dc5a01b9ad95..3f2a712ff79a 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -23,7 +23,6 @@ #include <svl/custritm.hxx> - class CntContentTypeItem : public CntUnencodedStringItem { private: diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index b4f6f083c052..599a5c1c9635 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -24,7 +24,6 @@ #include <svl/cenumitm.hxx> - class SVL_DLLPUBLIC SfxEnumItem : public SfxEnumItemInterface { @@ -59,7 +58,6 @@ public: }; - class SVL_DLLPUBLIC SfxBoolItem : public SfxPoolItem { diff --git a/include/svl/filenotation.hxx b/include/svl/filenotation.hxx index bfee7570bf68..4c99f834a56f 100644 --- a/include/svl/filenotation.hxx +++ b/include/svl/filenotation.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OFileNotation class SVL_DLLPUBLIC OFileNotation diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx index e7541c1d2bc7..41dc76f01b2a 100644 --- a/include/svl/isethint.hxx +++ b/include/svl/isethint.hxx @@ -26,7 +26,6 @@ class SfxItemSet; - class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint { SfxItemSet* _pItemSet; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 827129393b1e..37f3f419a62c 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -35,7 +35,6 @@ namespace comphelper } - // SvNumberFormatterServiceObj must be registered as service somewhere css::uno::Reference<css::uno::XInterface> SAL_CALL @@ -43,7 +42,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL const css::uno::Reference< css::lang::XMultiServiceFactory>& rSMgr ); - // SvNumberFormatsSupplierObj: aggregate to document, // construct with SvNumberFormatter diff --git a/include/svl/pickerhistoryaccess.hxx b/include/svl/pickerhistoryaccess.hxx index 4291dd04c1bf..7e855f17aff4 100644 --- a/include/svl/pickerhistoryaccess.hxx +++ b/include/svl/pickerhistoryaccess.hxx @@ -29,7 +29,6 @@ namespace svt { - SVL_DLLPUBLIC void addFolderPicker( const css::uno::Reference< css::uno::XInterface >& _rxPicker ); diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 3170df70b5c1..a8855de98a7e 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -26,7 +26,6 @@ class SvStream; - class SVL_DLLPUBLIC SfxRangeItem : public SfxPoolItem { private: @@ -49,7 +48,6 @@ public: }; - class SVL_DLLPUBLIC SfxUShortRangesItem : public SfxPoolItem { private: diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 174986e7300c..8216995608c1 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -297,7 +297,6 @@ public: }; - enum SfxStyleSheetHintId { CREATED = 1, // new @@ -314,7 +313,6 @@ public: }; - class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint { SfxStyleSheetBase* pStyleSh; diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 3aac88f79965..0dce8073f855 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -34,7 +34,6 @@ public: }; - class SVL_DLLPUBLIC SfxUndoContext { public: @@ -75,7 +74,6 @@ private: }; - /// is a mark on the Undo stack typedef sal_Int32 UndoStackMark; #define MARK_INVALID ::std::numeric_limits< UndoStackMark >::max() @@ -119,7 +117,6 @@ struct SVL_DLLPUBLIC SfxUndoArray }; - /** do not make use of these implementation details, unless you really really have to! */ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray @@ -159,7 +156,6 @@ public: }; - /** is a callback interface for notifications about state changes of an SfxUndoManager */ class SAL_NO_VTABLE SfxUndoListener @@ -181,7 +177,6 @@ protected: }; - namespace svl { class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI IUndoManager @@ -295,7 +290,6 @@ namespace svl } - namespace svl { namespace undo { namespace impl { class UndoManagerGuard; @@ -399,7 +393,6 @@ private: }; - class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction /* [Explanation] diff --git a/include/svtools/AccessibleBrowseBoxObjType.hxx b/include/svtools/AccessibleBrowseBoxObjType.hxx index 2b4f45fae2e0..33e54331ebd8 100644 --- a/include/svtools/AccessibleBrowseBoxObjType.hxx +++ b/include/svtools/AccessibleBrowseBoxObjType.hxx @@ -22,11 +22,9 @@ #define INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX - namespace svt { - /** This enumeration contains a constant for each kind of accessible object of a BrowseBox. */ enum AccessibleBrowseBoxObjType @@ -42,11 +40,9 @@ enum AccessibleBrowseBoxObjType }; - } // namespace svt - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index da67bf0c884e..3406a26ba19c 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -40,7 +40,6 @@ namespace svt { - // = AddressBookSourceDialog struct AddressBookSourceDialogData; @@ -136,7 +135,6 @@ namespace svt }; - } // namespace svt diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index 65ca905ab382..847e0711742e 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -28,7 +28,6 @@ namespace svt { - //= GraphicAccess /** helper class for obtaining streams (which also can be used with the ImageProducer) diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 71e8c8c66af5..08fe07b1fbe3 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -26,7 +26,6 @@ class BrowseBox; - class SVT_DLLPUBLIC BrowserHeader: public HeaderBar { VclPtr<BrowseBox> _pBrowseBox; diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index 693f8bb7f451..bfc01fe84610 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -30,7 +30,6 @@ namespace svt { - //= ODialogClosedListener /** diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index d1b488754080..5067dac0576d 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -32,7 +32,6 @@ namespace svt { - //= IWindowOperator /** an abstract interface for operating on a ->Window diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index 66dc7cb0fd78..ea3be15c9754 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -24,12 +24,10 @@ #include <rtl/ustring.hxx> - namespace svt { - /** This abstract class provides methods to implement an extension list box. This header is needed for the automatic test tool */ @@ -54,7 +52,6 @@ public: } // namespace svt - #endif // INCLUDED_SVTOOLS_EXTENSIONLISTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 835c3413b4e1..5c9cc0dbf0fc 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -28,7 +28,6 @@ namespace svt { - //= FileURLBox class SVT_DLLPUBLIC FileURLBox : public SvtURLBox diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index 6627b1d81ad7..77cc78a88511 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -61,5 +61,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 3ba669fef55e..adea1afbbdb1 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -49,7 +49,6 @@ namespace svt { - #define UNODIALOG_PROPERTY_ID_TITLE 1 #define UNODIALOG_PROPERTY_ID_PARENT 2 @@ -57,7 +56,6 @@ namespace svt #define UNODIALOG_PROPERTY_PARENT "ParentWindow" - typedef ::cppu::WeakImplHelper3 < css::ui::dialogs::XExecutableDialog , css::lang::XServiceInfo , css::lang::XInitialization diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 9a84eb86519c..d0d2be7dca65 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -83,6 +83,4 @@ public: #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index 0a2868d35504..2035ad66abc1 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -27,7 +27,6 @@ #define LABELBASEMAPHEIGHT 8 - namespace svt { diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index 845bc43f0380..99be3b08ea27 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -31,7 +31,6 @@ namespace svt { - //= GraphicAccess /** helper class for obtaining streams (which also can be used with the ImageProducer) diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx index db061d6a0d4e..3258ba0a1f8a 100644 --- a/include/svtools/inetimg.hxx +++ b/include/svtools/inetimg.hxx @@ -26,7 +26,6 @@ class SvData; class SotDataObject; - class INetImage { OUString aImageURL; diff --git a/include/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx index d0ebc4365f41..f38b1d31d704 100644 --- a/include/svtools/localresaccess.hxx +++ b/include/svtools/localresaccess.hxx @@ -29,7 +29,6 @@ namespace svt { - //= OLocalResourceAccess /** helper class for acessing local resources diff --git a/include/svtools/scriptedtext.hxx b/include/svtools/scriptedtext.hxx index 7195e670a89d..2b8e882bfa7f 100644 --- a/include/svtools/scriptedtext.hxx +++ b/include/svtools/scriptedtext.hxx @@ -32,8 +32,6 @@ class Size; class Point; - - /** This class provides drawing text with different script types on any output devices. */ @@ -89,7 +87,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx index bba9f6e7f0fa..d12a6f9e56fa 100644 --- a/include/svtools/soerr.hxx +++ b/include/svtools/soerr.hxx @@ -68,7 +68,6 @@ #define ERRCTX_SO_DOVERB 1 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 401a415624cc..65a7bc1ae8a5 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OStringTransferable class SVT_DLLPUBLIC OStringTransferable : public TransferableHelper diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 29d2e6ba7a91..85012f628704 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -69,7 +69,6 @@ DeactivatePage - Is called, when a page is deactivated. If another page deactivated. - Drag and Drop ------------- diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index f11729347c7c..aa7b30ff6f4f 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -33,7 +33,6 @@ namespace svt { namespace table { - //= ITableRenderer /** interface to implement by components rendering a ->TableControl diff --git a/include/svtools/table/tablesort.hxx b/include/svtools/table/tablesort.hxx index 9a46bba0abf2..56f1a46000b0 100644 --- a/include/svtools/table/tablesort.hxx +++ b/include/svtools/table/tablesort.hxx @@ -27,7 +27,6 @@ namespace svt { namespace table { - //= ColumnSortDirection enum ColumnSortDirection diff --git a/include/svtools/table/tabletypes.hxx b/include/svtools/table/tabletypes.hxx index 8c7258f71a4f..727ab2368c61 100644 --- a/include/svtools/table/tabletypes.hxx +++ b/include/svtools/table/tabletypes.hxx @@ -55,7 +55,6 @@ namespace svt { namespace table #define ROW_INVALID ((::svt::table::RowPos)-2) - } } // namespace svt::table diff --git a/include/svtools/templatefoldercache.hxx b/include/svtools/templatefoldercache.hxx index dcb3e268e493..1a55658be02d 100644 --- a/include/svtools/templatefoldercache.hxx +++ b/include/svtools/templatefoldercache.hxx @@ -29,7 +29,6 @@ namespace svt { - //= TemplateFolderCache class TemplateFolderCacheImpl; diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 36337f4c6857..c61c160984a8 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -178,8 +178,6 @@ protected: }; - - /** * SvEventDescriptor: Implement the XNameReplace that is delivered by * the XEventsSupplier::getEvents() method. The SvEventDescriptor has diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index c5fc70c2c86f..e97d6d8fba04 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -28,7 +28,6 @@ namespace svt { - //= OFileURLControl class SVT_DLLPUBLIC OFileURLControl : public SvtURLBox diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index e9b7ab2af541..cbb1ee2f6565 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -30,7 +30,6 @@ namespace vcl { class Window; } - class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem { css::uno::Reference< css::awt::XWindow > m_xWin; @@ -49,7 +48,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx index d9f7ff9c2105..f43517931963 100644 --- a/include/svx/IAccessibleViewForwarder.hxx +++ b/include/svx/IAccessibleViewForwarder.hxx @@ -27,7 +27,6 @@ namespace accessibility { - /** <p>This interface provides the means to transform between internal coordinates in 100th of mm and screen coordinates without giving direct access to the underlying view. Each view forwarder represents a diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index 83429963b7d6..8a1794ede563 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -74,5 +74,4 @@ namespace svxform #endif // INCLUDED_SVX_PARSECONTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/anchorid.hxx b/include/svx/anchorid.hxx index ab4e1bb0e69e..921769cd5ecc 100644 --- a/include/svx/anchorid.hxx +++ b/include/svx/anchorid.hxx @@ -30,7 +30,6 @@ enum SvxAnchorIds }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx index 69999a94fd5e..9d4c6ab361bf 100644 --- a/include/svx/databaselocationinput.hxx +++ b/include/svx/databaselocationinput.hxx @@ -33,7 +33,6 @@ namespace svx { - //= DatabaseLocationInputController class DatabaseLocationInputController_Impl; diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index 30e28a853506..3a1d668c6a30 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -33,7 +33,6 @@ namespace svx { - //= OComponentTransferable class SVX_DLLPUBLIC SAL_WARN_UNUSED OComponentTransferable : public TransferableHelper diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index d400e08b6071..e43b7170bf40 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -30,7 +30,6 @@ class NumericField; namespace svx { - class SAL_WARN_UNUSED DialControlBmp : public VirtualDevice { public: diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx index ac2acebf42c8..234623dde9d6 100644 --- a/include/svx/flagsdef.hxx +++ b/include/svx/flagsdef.hxx @@ -108,7 +108,6 @@ enum SvxModeType #define TABFILL_ALL 0x01F0 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 9747eab45432..881b01bea5d3 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -524,7 +524,6 @@ protected: }; - #endif // _SVX_FMGRID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx index 5177751b6728..e46bbd132e34 100644 --- a/include/svx/fmsrccfg.hxx +++ b/include/svx/fmsrccfg.hxx @@ -25,7 +25,6 @@ #include <svx/svxdllapi.h> - #define MATCHING_ANYWHERE 0 #define MATCHING_BEGINNING 1 #define MATCHING_END 2 @@ -37,12 +36,10 @@ // to be adapted) - namespace svxform { - // = struct FmSearchParams - parameters of a search @@ -140,8 +137,6 @@ namespace svxform } - - #endif // INCLUDED_SVX_FMSRCCFG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx index b0f9be3d9689..658cffa7cfde 100644 --- a/include/svx/fntctl.hxx +++ b/include/svx/fntctl.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> - class FontNameMenu; class SfxBindings; diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx index 2b110b7a06ef..c8cf43530968 100644 --- a/include/svx/fntszctl.hxx +++ b/include/svx/fntszctl.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - class SfxBindings; class FontSizeMenu; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index c9be5b5bbd7f..58a6072a67a4 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -26,7 +26,6 @@ #include <svx/svxdllapi.h> - /** A list box string item which stores its text and font. */ class SAL_WARN_UNUSED SvLBoxFontString : public SvLBoxString { @@ -56,8 +55,6 @@ public: }; - - /** A list box supporting formatted string entries. */ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontListBox : public SvTabListBox { diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index 3e004723a2ca..5e48c8654382 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -44,7 +44,6 @@ class SdrModel; class SfxBindings; - namespace svx { diff --git a/include/svx/framebordertype.hxx b/include/svx/framebordertype.hxx index afc05e616d1a..fa4385d246b6 100644 --- a/include/svx/framebordertype.hxx +++ b/include/svx/framebordertype.hxx @@ -25,7 +25,6 @@ namespace svx { - /** Enumerates all borders a frame selection control can contain. */ enum FrameBorderType { @@ -50,7 +49,6 @@ SVX_DLLPUBLIC FrameBorderType GetFrameBorderTypeFromIndex( size_t nIndex ); size_t GetIndexFromFrameBorderType( FrameBorderType eBorder ); - } #endif diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 2ef4f4a5357f..8b7a9fd4a371 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -177,7 +177,6 @@ inline bool operator>( const Style& rL, const Style& rR ) { return rR < rL; } inline bool operator<=( const Style& rL, const Style& rR ) { return !(rR < rL); } - /** Extends the Style struct with an angle for diagonal frame borders. The angle is specified in radian (a full circle is equivalent to 2*PI). @@ -223,7 +222,6 @@ inline double GetHorDiagAngle( const Rectangle& rRect ) { return GetHorDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } - /** Returns the angle between vertical border of a rectangle and its diagonal. The returned values represents the inner angle between the diagonals and @@ -242,7 +240,6 @@ inline double GetVerDiagAngle( const Rectangle& rRect ) { return GetVerDiagAngle( rRect.GetWidth(), rRect.GetHeight() ); } - /** Returns an X coordinate for a diagonal frame border in the specified height. This function is for usage with the top-left end of a top-left to @@ -358,7 +355,6 @@ long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ); - /** Checks whether two horizontal frame borders are "connectable". Two borders are "connectable" in terms of this function, if both can be @@ -541,7 +537,6 @@ SVX_DLLPUBLIC void DrawHorFrameBorder( ); - /** Draws a vertical frame border, regards all connected frame styles. The frame style to draw is passed as parameter rBorder. The function @@ -612,7 +607,6 @@ SVX_DLLPUBLIC void DrawVerFrameBorder( ); - /** Draws both diagonal frame borders, regards all connected frame styles. One or both passed diagonal frame styles may be invisible. @@ -641,7 +635,6 @@ SVX_DLLPUBLIC void DrawDiagFrameBorders( ); - } } diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index a1d1f6350937..ea91d5ba6d51 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -376,7 +376,6 @@ public: void DrawArray( OutputDevice& rDev, const Color* pForceColor = nullptr ) const; - private: typedef std::unique_ptr<ArrayImpl> ArrayImplPtr; diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index 8704edc464e3..31fc49843daf 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -30,7 +30,6 @@ class SvxFrameDirectionItem; namespace svx { - /** This listbox contains entries to select horizontal text direction. The control works on the SvxFrameDirection enumeration (i.e. left-to-right, @@ -64,7 +63,6 @@ private: typedef FrameDirectionListBox FrameDirListBox; - /** Wrapper for usage of a FrameDirectionListBox in item connections. */ class SVX_DLLPUBLIC SAL_WARN_UNUSED FrameDirListBoxWrapper : public sfx::SingleControlWrapper< FrameDirListBox, SvxFrameDirection > { @@ -85,7 +83,6 @@ typedef sfx::ValueItemWrapper< SvxFrameDirectionItem, SvxFrameDirection, sal_uIn typedef sfx::ItemControlConnection< FrameDirItemWrapper, FrameDirListBoxWrapper > FrameDirListBoxConnection; - } #endif diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 33240c7333a8..fc16b3bb3557 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -37,7 +37,6 @@ namespace svx { struct FrameSelectorImpl; - typedef int FrameSelFlags; const FrameSelFlags FRAMESEL_NONE = 0x0000; @@ -69,7 +68,6 @@ const FrameSelFlags FRAMESEL_DIAGONAL = FRAMESEL_DIAG_TLBR|FRAMESEL_DIAG_BLTR; const FrameSelFlags FRAMESEL_DONTCARE = 0x0100; - /** All possible states of a frame border. */ enum FrameBorderState { @@ -191,7 +189,6 @@ private: }; - } #endif diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx index fa3b2b193c48..b9af1f24288f 100644 --- a/include/svx/helperhittest3d.hxx +++ b/include/svx/helperhittest3d.hxx @@ -39,7 +39,6 @@ class E3dCompoundObject; class E3dScene; - /** support for getting a ViewInformation3D for a given CompoudObject3D with correct ObjectTransformation filled out @@ -96,7 +95,6 @@ bool checkHitSingle3DObject( const E3dCompoundObject& rCandidate); - #endif // INCLUDED_SVX_HELPERHITTEST3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/ifaceids.hxx b/include/svx/ifaceids.hxx index 61aafef39e07..fe7cebae0710 100644 --- a/include/svx/ifaceids.hxx +++ b/include/svx/ifaceids.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVX_IFACEIDS_HXX - #include <sfx2/shell.hxx> #define SVX_INTERFACE_BASIDE_DOCSH (SFX_INTERFACE_IDE_START+ 0) diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index 75a2f24bfb7c..0dd05213cbaf 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -29,7 +29,6 @@ class ToolBox; class SvxPopupWindowListBox; - class SvxListBoxControl : public SfxToolBoxControl { protected: @@ -52,7 +51,6 @@ public: }; - class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl { std::vector< OUString > aUndoRedoList; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 39d87f6bdd72..54cd7d664225 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -73,7 +73,6 @@ public: }; - // class SvxLineEndWindow class SvxLineEndWindow : public SfxPopupWindow @@ -143,7 +142,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index cbc76bc3eee8..626f7ebf0dc9 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -26,7 +26,6 @@ // class SvxNumberInfoItem ----------------------------------------------- - /* This item is used as a transport medium for a number formatter */ @@ -80,7 +79,6 @@ private: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx index 5b625f91dd32..6376a9cbcbbe 100644 --- a/include/svx/objfac3d.hxx +++ b/include/svx/objfac3d.hxx @@ -44,7 +44,6 @@ public: }; - #endif // INCLUDED_SVX_OBJFAC3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 5d9e188c3a8e..80d252f148d2 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -33,7 +33,6 @@ namespace svx { class DialControl; - struct OrientationHelper_Impl; /** A helper class that manages a DialControl and a "Stacked text" check box. @@ -91,7 +90,6 @@ private: }; - /** Wrapper for usage of the stacked attribute of an OrientationHelper in item connections. */ class SVX_DLLPUBLIC OrientStackedWrapper : public sfx::SingleControlWrapper< OrientationHelper, bool > { @@ -106,12 +104,10 @@ public: }; - /** An item<->control connection for the stacked attribute of an OrientationHelper. */ typedef sfx::ItemControlConnection< sfx::BoolItemWrapper, OrientStackedWrapper > OrientStackedConnection; - } // namespace #endif diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 4c3ca3c5d008..cbdcba7b0605 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -103,7 +103,6 @@ public: }; - /*-------------------------------------------------------------------- container for header/footer attributes --------------------------------------------------------------------*/ @@ -127,8 +126,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index edcf0c0d0f7c..8d929c9aba50 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -25,7 +25,6 @@ // class SvxPostItAuthorItem --------------------------------------------- - /* The author shorthand symbol of a note */ @@ -56,7 +55,6 @@ public: // class SvxPostItDateItem ----------------------------------------------- - /* The date of a note */ @@ -87,7 +85,6 @@ public: // class SvxPostItTextItem ----------------------------------------------- - /* The text of a note */ @@ -116,7 +113,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index d0920f85bfe9..84be72803f55 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrAngleItem class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 2ec9ba0c33aa..3e49210aded7 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrAngleItem // For all metrics. GetPresentation returns for example for // Value=2500 a "25mm". diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 426bb5245a2b..317f88deb0fb 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrOnOffItem // here GetValueTextByVal() returns "an" or "aus" instead // of "TRUE" or "FALSE" diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 1a66630e4ddc..c0d071c036bf 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrPercentItem // Integer percents of 0 diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx index 11f86d37001d..5665b02d3eec 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -27,7 +27,6 @@ #include <svx/sdr/animation/animationstate.hxx> - namespace sdr { namespace animation @@ -43,7 +42,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 703a8fb03d70..1738ca5d1576 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -142,7 +142,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx index 466b95ee37db..20150dc66011 100644 --- a/include/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrformtextattribute.hxx @@ -35,7 +35,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -80,7 +79,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx index 2cdc7c0a7103..077a3455e7c4 100644 --- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> - namespace drawinglayer { namespace attribute @@ -63,7 +62,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx index a1b074487569..039228e007bf 100644 --- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx @@ -26,7 +26,6 @@ #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> - namespace drawinglayer { namespace attribute @@ -61,7 +60,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx index 4e208cdd385b..e9841662f90f 100644 --- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx @@ -25,7 +25,6 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> - namespace drawinglayer { namespace attribute @@ -58,7 +57,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx index 1d8aebc06d6c..01aa02aef141 100644 --- a/include/svx/sdr/attribute/sdrtextattribute.hxx +++ b/include/svx/sdr/attribute/sdrtextattribute.hxx @@ -43,7 +43,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -125,7 +124,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index 23190a450f40..7a00f143a392 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -101,7 +101,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index e09e8830e151..3b5b29c30d61 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -203,7 +203,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index d9ee440f0272..5c9066988daf 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -114,7 +114,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index c34f5e9304df..14d07c3fe3e3 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -144,7 +144,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index 1b0aee383c5a..73e60de18715 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -93,7 +93,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index 874b2140d4f8..1a10091f5ac7 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -55,7 +55,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index e440ee67a4af..8a304e22d30e 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -70,7 +70,6 @@ protected: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index 9e8b4e972ffd..e288ab9f8737 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -129,7 +129,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index a4d3ff3e616f..4b4fe02489de 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -48,7 +48,6 @@ public: }} - #endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 8594e683ce71..b7afa32b46e8 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -24,7 +24,6 @@ #include <vcl/bitmapex.hxx> - namespace sdr { namespace overlay @@ -90,7 +89,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index 25913c1633dc..6cd19e4fa111 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -24,7 +24,6 @@ #include <vcl/bitmapex.hxx> - namespace sdr { namespace overlay @@ -70,7 +69,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index 989c7c903e89..b8999517f269 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -25,7 +25,6 @@ #include <vector> - namespace sdr { namespace overlay @@ -55,7 +54,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index 459b9ab1ce82..4fdba83ae798 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -25,12 +25,10 @@ #include <svx/svxdllapi.h> - #define DEFAULT_VALUE_FOR_HITTEST_PIXEL (2L) #define DEFAULT_VALUE_FOR_HITTEST_TWIP (30L) - class Point; namespace sdr @@ -70,7 +68,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 4e331b0356f1..ba14a6dff9be 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -25,7 +25,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> - namespace sdr { namespace overlay @@ -54,7 +53,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index dcaf3c7ed886..67ffa8ae3f79 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace sdr { namespace overlay @@ -51,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index 297a1e08a48d..23c3036ee844 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -24,7 +24,6 @@ #include <vcl/region.hxx> - namespace sdr { namespace overlay @@ -80,7 +79,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx index 2bf74f5cdbe4..15e489b8e5ab 100644 --- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -50,7 +50,6 @@ namespace basegfx { } - namespace drawinglayer { namespace primitive2d @@ -128,7 +127,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx index eb7a29911f6e..e2ae6d6853a7 100644 --- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -41,7 +41,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace primitive2d @@ -79,7 +78,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index 1161f2c8c194..5123b811a0e3 100644 --- a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> - #define PRIMITIVE2D_ID_SDRCAPTIONPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 0) #define PRIMITIVE2D_ID_SDRCONNECTORPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 1) #define PRIMITIVE2D_ID_SDRCUSTOMSHAPEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 2) @@ -51,7 +50,6 @@ #define PRIMITIVE2D_ID_SDRCHAINEDTEXTPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_SVX| 24) - #endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index ccc3b84d5e25..0c70cdfce961 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> - namespace sdr { namespace properties diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index aaabfc729bf4..0dbc9b23a4f8 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -63,7 +63,6 @@ SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit( bool bTextOnly); - #endif // INCLUDED_SVX_SDRHITTESTHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx index c08678cc4c95..bb200991a298 100644 --- a/include/svx/sdrobjectfilter.hxx +++ b/include/svx/sdrobjectfilter.hxx @@ -29,7 +29,6 @@ namespace svx { - //= SdrObjectFilter /** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter. diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index ff3bb995bfa8..2196eed121f0 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -23,7 +23,6 @@ #include <svx/svxdllapi.h> - // class SdrYesNoItem // GetValueTextByVal() returns "yes" or "no" // instead of "TRUE" and "FALSE" diff --git a/include/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx index 11b9eae1dfbe..4ed901a48a12 100644 --- a/include/svx/shapeproperty.hxx +++ b/include/svx/shapeproperty.hxx @@ -25,7 +25,6 @@ namespace svx { - //= ShapeProperty enum ShapeProperty diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index b673f5304674..dd8a6488c6de 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -38,7 +38,6 @@ namespace svx { - //= IPropertyValueProvider /** a provider for a property value diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 2820436a33f4..f28579a7c746 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -48,7 +48,6 @@ public: }; - class SVX_DLLPUBLIC SdrDragEntryPolyPolygon : public SdrDragEntry { private: @@ -62,7 +61,6 @@ public: }; - class SdrDragEntrySdrObject : public SdrDragEntry { private: @@ -85,7 +83,6 @@ public: }; - class SdrDragEntryPrimitive2DSequence : public SdrDragEntry { private: @@ -101,7 +98,6 @@ public: }; - class SdrDragEntryPointGlueDrag : public SdrDragEntry { private: @@ -116,7 +112,6 @@ public: }; - class SVX_DLLPUBLIC SdrDragMethod { private: diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 5fccc68595fe..965a350b6e40 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -240,7 +240,6 @@ public: sal_uInt16 GetSelectionLevel() const; - // Object-MacroModus (e.g. rect as button or sth. like that): // Persistent. Default TRUE. SvDraw evaluates the flag e.g. at SdrView::GetPreferredPointer(). diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 0cc1798979ca..a82732e59ab8 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -28,7 +28,6 @@ #include <vcl/outdev.hxx> - /** * Get ExchangeFormatID of the DrawingEngine. * The data can then be made available via @@ -109,7 +108,6 @@ class SfxItemSet; SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); - /** * Search an ItemSet for Outliner/EditEngine Items * @@ -253,7 +251,6 @@ class SdrObjEditView; SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); - #endif // INCLUDED_SVX_SVDETC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index c880eab46c33..40c3ed4cdba6 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -150,8 +150,6 @@ public: }; - - #endif // INCLUDED_SVX_SVDGLUE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 197a451c01a9..1fa1a07b0d57 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -82,7 +82,6 @@ enum SdrHdlKind }; - enum BitmapColorIndex { LightGreen, @@ -94,7 +93,6 @@ enum BitmapColorIndex }; - enum BitmapMarkerKind { Rect_7x7, @@ -130,7 +128,6 @@ enum BitmapMarkerKind }; - class SVX_DLLPUBLIC SdrHdl { friend class SdrMarkView; // for the access to nObjHdlNum @@ -241,7 +238,6 @@ public: }; - #define SDR_HANDLE_COLOR_SIZE_NORMAL Size(13, 13) #define SDR_HANDLE_COLOR_SIZE_SELECTED Size(17, 17) @@ -283,7 +279,6 @@ public: }; - class SdrHdlGradient : public SdrHdl { private: @@ -332,7 +327,6 @@ public: }; - // Spiegelachse class SdrHdlLine: public SdrHdl { @@ -368,7 +362,6 @@ public: }; - class E3dVolumeMarker : public SdrHdl { basegfx::B2DPolyPolygon aWireframePoly; @@ -381,7 +374,6 @@ public: }; - class ImpEdgeHdl: public SdrHdl { SdrEdgeLineCode eLineCode; @@ -400,7 +392,6 @@ public: }; - class ImpMeasureHdl: public SdrHdl { // create marker for this kind @@ -414,7 +405,6 @@ public: }; - class ImpTextframeHdl: public SdrHdl { const Rectangle maRect; @@ -427,9 +417,6 @@ public: }; - - - class SVX_DLLPUBLIC SdrHdlList { protected: @@ -490,7 +477,6 @@ public: }; - class SVX_DLLPUBLIC SdrCropHdl : public SdrHdl { private: @@ -516,7 +502,6 @@ protected: }; - class SVX_DLLPUBLIC SdrCropViewHdl : public SdrHdl { private: @@ -542,7 +527,6 @@ protected: }; - #endif // INCLUDED_SVX_SVDHDL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index 024124d464c0..e00cbb92a23c 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -90,7 +90,6 @@ public: }; - #endif // INCLUDED_SVX_SVDHLPLN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 684ea658f36b..9f1ea4b18eee 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -141,7 +141,6 @@ public: }; - // Flag for cleaning up after the loading of the pools, meaning the // recalculate the RefCounts and dispose unused items) // sal_False == active @@ -627,8 +626,6 @@ public: }; - - #endif // INCLUDED_SVX_SVDMODEL_HXX /* diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 5d37f2bdc1fd..15a987e2b55f 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -262,7 +262,6 @@ public: const std::vector<SdrObject*>& GetTransitiveHullOfMarkedObjects() const { return mpSdrViewSelection->GetAllMarkedObjects(); } - // mechanism to complete disable handles at the view. Handles will be hidden and deleted // when set, no new ones created, no interaction allowed. Handles will be recreated and shown // when reset. Default is false. @@ -452,7 +451,6 @@ public: }; - // - Hit tolarances: // It has to be declared in logical coordinates. So please translate the // wanted pixel value with PixelToLogic in Logical values. @@ -468,7 +466,6 @@ public: // In opposite, a hit in the surrounding sensitive area enables Dragging. - #endif // INCLUDED_SVX_SVDMRKV_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index c2b86d842da3..543e67b3e698 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -76,7 +76,6 @@ public: }; - #endif // INCLUDED_SVX_SVDOATTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 2cbe7445271a..24d9e0b953ca 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -153,7 +153,6 @@ public: }; - #endif //_SVDOCAPT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index fa3ba75e4110..3b1ca61ad0bb 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -61,7 +61,6 @@ public: }; - #endif // INCLUDED_SVX_SVDOPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index a38a27f26c8b..a8be427cef3c 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -28,7 +28,6 @@ #include <svx/svxdllapi.h> - class SvStream; class SfxStyleSheet; class SdrUndoAction; @@ -61,7 +60,6 @@ enum TableHitKind }; - struct CellPos { sal_Int32 mnCol; @@ -321,7 +319,6 @@ private: }; - } } #endif diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index d43bc5062575..49bbdf7debb9 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -559,8 +559,6 @@ public: void onChainingEvent(); - - // transformation interface for StarOfficeAPI. This implements support for // homogen 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear @@ -637,7 +635,6 @@ public: }; - #endif // INCLUDED_SVX_SVDOTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index b459773b87b9..056fb405e92e 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -561,7 +561,6 @@ public: }; - #endif // INCLUDED_SVX_SVDPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index beaf794336d5..57dae8455441 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -34,7 +34,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - namespace vcl { class Region; } class SdrObjList; class SdrObject; @@ -60,7 +59,6 @@ class SdrPageWindow; typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector; - class SVX_DLLPUBLIC SdrPageView { private: @@ -264,7 +262,6 @@ public: }; - #endif // INCLUDED_SVX_SVDPAGV_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index a5cd4f1bf51c..3035b2f762c3 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -79,7 +79,6 @@ typedef unsigned char SDR_TRISTATE; #define SDRVIEWWIN_NOTFOUND (0xFFFF) - class SdrPaintView; namespace sdr @@ -91,8 +90,6 @@ namespace sdr } - - class SVX_DLLPUBLIC SvxViewHint : public SfxHint { public: @@ -119,7 +116,6 @@ BitmapEx SVX_DLLPUBLIC convertMetafileToBitmapEx( const sal_uInt32 nMaximumQuadraticPixels = 500000); - class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { friend class SdrPageView; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index ae1ff5d31d4a..1a5c8da77037 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -28,7 +28,6 @@ class XLineAttrSetItem; class XFillAttrSetItem; - class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool { public: diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index 35c8bb8d851d..b2f6ce112b3d 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -25,7 +25,6 @@ #include <tools/weakbase.hxx> - class OutlinerParaObject; class SdrOutliner; class SdrTextObj; diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 1534f5b3984b..074def139a07 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -324,7 +324,6 @@ public: }; - #endif // INCLUDED_SVX_SVDTRANS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 346f6c32d062..d11a31239aee 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -724,7 +724,6 @@ public: }; - /** * The SdrUndoFactory can be set and retrieved from the SdrModel. * It is used by the drawing layer implementations to create undo actions. diff --git a/include/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx index a2990b7593b1..76cbac8b97a0 100644 --- a/include/svx/tbxcolor.hxx +++ b/include/svx/tbxcolor.hxx @@ -27,7 +27,6 @@ namespace svx { - //= ToolboxAccess class SVX_DLLPUBLIC ToolboxAccess diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx index d356f889bb30..ed807b52c51f 100644 --- a/include/svx/tbxcolorupdate.hxx +++ b/include/svx/tbxcolorupdate.hxx @@ -34,7 +34,6 @@ namespace svx { - //= ToolboxButtonColorUpdater /** helper class to update a color in a toolbox button image diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx index fde0c81fe0d0..2c288aeae31a 100644 --- a/include/svx/txenctab.hxx +++ b/include/svx/txenctab.hxx @@ -25,7 +25,6 @@ #include <tools/resary.hxx> - // class SvxTextEncodingTable diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 7324bdd129a9..de0c0a57a901 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> - class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item { bool mbBookMode; @@ -49,7 +48,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 457a213d4511..89ff80132568 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -39,8 +39,6 @@ namespace svx { - - //= OXFormsDescriptor @@ -85,7 +83,6 @@ namespace svx }; - } diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 24a7d72270b7..ca23d3f7736f 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -25,7 +25,6 @@ #include <svx/svxdllapi.h> - class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item { css::uno::Sequence < sal_Int32 > maValues; @@ -54,7 +53,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index ad7ee08bea82..4acfd46b055d 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -33,7 +33,6 @@ namespace toolkit { - //= AnimatedImagesPeer struct AnimatedImagesPeer_Data; diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 7025540894ba..6ae436ec40cf 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -46,7 +46,6 @@ class AccessibleStateSetHelper; } - // class VCLXAccessibleComponent diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 9e5391f0a874..fdbbf3a1fe7e 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -29,7 +29,6 @@ #include <vcl/bitmapex.hxx> - // class VCLXBitmap @@ -73,8 +72,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx index 7cafa4ac9764..2ba61b179674 100644 --- a/include/toolkit/awt/vclxcontainer.hxx +++ b/include/toolkit/awt/vclxcontainer.hxx @@ -30,7 +30,6 @@ #include <toolkit/awt/vclxwindow.hxx> - // class VCLXContainer @@ -69,8 +68,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index 4d54ec521c59..e216f2df4468 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -108,8 +108,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index c65684682bff..85b00d1cad4d 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -83,7 +83,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx index 18c41f89ad30..145d3bc7f99f 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/include/toolkit/awt/vclxpointer.hxx @@ -69,8 +69,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 727baebd0c75..6225b258a18f 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -82,7 +82,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx index d7114a175b2c..6d932925075f 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/include/toolkit/awt/vclxspinbutton.hxx @@ -30,7 +30,6 @@ namespace toolkit { - //= VCLXSpinButton typedef ::cppu::ImplHelper1 < css::awt::XSpinValue diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx index 29840ffb5458..684136cf5f5e 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx @@ -53,8 +53,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index 5335e700f3e0..a8bf16e9d0f3 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -106,8 +106,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index de95b539a122..f065f4788070 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -108,7 +108,6 @@ class VclMenuEvent; // deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model - class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow { private: @@ -401,8 +400,6 @@ public: }; - - // class VCLXDialog class TOOLKIT_DLLPUBLIC VCLXDialog : public css::awt::XDialog2, diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index 286be0861491..e7ab21bc16fd 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -34,7 +34,6 @@ namespace toolkit { - //= OAccessibleControlContext diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx index bbf694baed73..f6ef3585ea45 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/include/toolkit/controls/formattedcontrol.hxx @@ -31,7 +31,6 @@ namespace toolkit { - // = UnoControlFormattedFieldModel class UnoControlFormattedFieldModel : public UnoControlModel diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index e858e0722b04..549e7e12cbdc 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -50,7 +50,6 @@ namespace com { namespace sun { namespace star { // { - //= OGeometryControlModel_Base typedef ::cppu::WeakAggComponentImplHelper2 < css::util::XCloneable diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index 5efc1f354c75..e7eedd0096bc 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -53,7 +53,6 @@ namespace toolkit > UnoControlRoadmapModel_IBase; - typedef UnoControlBase UnoControlRoadmap_Base; typedef ::cppu::ImplHelper4 < css::awt::XItemEventBroadcaster , css::container::XContainerListener @@ -62,13 +61,10 @@ namespace toolkit > UnoControlRoadmap_IBase; - - typedef ::cppu::ImplHelper2< css::container::XContainerListener, css::awt::XItemEventBroadcaster> SVTXRoadmap_Base; - // = UnoControlRoadmapModel class UnoControlRoadmapModel : public UnoControlRoadmapModel_Base, @@ -147,7 +143,6 @@ namespace toolkit }; - // = UnoRoadmapControl class UnoRoadmapControl : public UnoControlRoadmap_Base, @@ -194,8 +189,6 @@ namespace toolkit } // toolkit - - #endif // _ INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx index 540ef9ca76b1..d915fc723941 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/include/toolkit/controls/stdtabcontroller.hxx @@ -88,7 +88,6 @@ public: }; - #endif // _TOOLKIT_AWT_STDTABCONTROLLER_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx index bcace97f0ce3..92d54dbc4386 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/include/toolkit/controls/stdtabcontrollermodel.hxx @@ -139,7 +139,6 @@ public: }; - #endif // _TOOLKIT_HELPER_STDTABCONTROLLERMODEL_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx index cfd29157dd22..7e1f3c6b0cba 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/include/toolkit/controls/tkscrollbar.hxx @@ -32,7 +32,6 @@ namespace toolkit { - //= UnoControlScrollBarModel class UnoControlScrollBarModel : public UnoControlModel @@ -116,8 +115,6 @@ namespace toolkit }; - - } // namespacetoolkit diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index d31f49bcddce..8c729cbf348b 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -230,8 +230,6 @@ private: }; - - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index aa15a3e2cdec..9021c97186cf 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -62,7 +62,6 @@ protected: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx index b08430984fd9..2c220b01c88e 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/include/toolkit/controls/unocontrolcontainer.hxx @@ -158,7 +158,6 @@ private: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index cc7fcbc84d64..46ee1cab2ecc 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -26,7 +26,6 @@ #include <toolkit/helper/servicenames.hxx> - // class css::awt::UnoControlContainerModel class UnoControlContainerModel : public UnoControlModel @@ -56,7 +55,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index 8b8b88b2da3e..0574e57b7909 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -1097,7 +1097,6 @@ public: }; - // class UnoControlDateFieldModel class UnoControlDateFieldModel : public UnoControlModel @@ -1558,7 +1557,6 @@ public: }; - // class UnoControlFixedLineModel class UnoControlFixedLineModel : public UnoControlModel @@ -1607,7 +1605,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx index 96d5ab54a426..9dc25084cf7c 100644 --- a/include/toolkit/helper/emptyfontdescriptor.hxx +++ b/include/toolkit/helper/emptyfontdescriptor.hxx @@ -42,8 +42,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx index 49dab94db067..5079d7cbfbdb 100644 --- a/include/toolkit/helper/listenermultiplexer.hxx +++ b/include/toolkit/helper/listenermultiplexer.hxx @@ -74,7 +74,6 @@ public: }; - // class EventListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( EventListenerMultiplexer, css::lang::XEventListener ) @@ -89,7 +88,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( FocusListenerMultiplexer, css::awt::XFocu DECL_LISTENERMULTIPLEXER_END - // class WindowListenerMultiplexer DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWindowListener ) @@ -100,8 +98,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( WindowListenerMultiplexer, css::awt::XWin DECL_LISTENERMULTIPLEXER_END - - // class VclContainerListenerMultiplexer DECL_LISTENERMULTIPLEXER_START( VclContainerListenerMultiplexer, css::awt::XVclContainerListener ) diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index e844bd350677..408c6eb13b18 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -70,7 +70,6 @@ css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::Runti cppu::UnoType<css::lang::XTypeProvider>::get(), - #define IMPL_XTYPEPROVIDER_END \ ); \ pCollection = &collection; \ @@ -80,7 +79,6 @@ css::uno::Sequence< css::uno::Type > ClassName::getTypes() throw(css::uno::Runti } - #define DECL_LISTENERMULTIPLEXER_START( ClassName, InterfaceName ) \ class ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ @@ -92,7 +90,6 @@ public: \ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - #define DECL_LISTENERMULTIPLEXER_START_DLLPUB( ClassName, InterfaceName ) \ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public InterfaceName \ { \ @@ -104,12 +101,10 @@ public: \ void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; - #define DECL_LISTENERMULTIPLEXER_END \ }; - #define IMPL_LISTENERMULTIPLEXER_BASEMETHODS( ClassName, InterfaceName ) \ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ : ListenerMultiplexerBase( rSource ) \ @@ -129,7 +124,6 @@ void ClassName::disposing( const css::lang::EventObject& ) throw(css::uno::Runti } - #if OSL_DEBUG_LEVEL > 0 #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ OString sMessage( #ClassName "::" #MethodName ": caught an exception!\n" ); \ diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx index 949d644d9558..a43504c0a103 100644 --- a/include/toolkit/helper/mutexhelper.hxx +++ b/include/toolkit/helper/mutexhelper.hxx @@ -37,8 +37,6 @@ public: }; - - #endif // INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx index 114795b880f7..d3a637dc46d4 100644 --- a/include/toolkit/helper/property.hxx +++ b/include/toolkit/helper/property.hxx @@ -243,8 +243,6 @@ bool DoesDependOnOthers( sal_uInt16 nPropertyId ); bool CompareProperties( const css::uno::Any& r1, const css::uno::Any& r2 ); - - #endif // INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 7a98f0a4e913..e8bf2a1fff55 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -636,7 +636,6 @@ inline void Rectangle::expand(long nExpandBy) } - template< typename charT, typename traits > inline std::basic_ostream<charT, traits> & operator <<( std::basic_ostream<charT, traits> & stream, const Rectangle& rectangle ) diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx index af6bae2ea8b9..4516c3bab2e6 100644 --- a/include/ucbhelper/activedatastreamer.hxx +++ b/include/ucbhelper/activedatastreamer.hxx @@ -27,7 +27,6 @@ namespace ucbhelper { - /** * This class implements the interface css::io::XActiveDataStreamer. * Instances of this class can be passed with the parameters of an diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index 7715470d58c1..e31a95d2af04 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -61,7 +61,6 @@ namespace ucbhelper { - /** * These are the possible values for the parameter eMode of method * ucbhelper::Content::createCursor. @@ -86,7 +85,6 @@ enum InsertOperation }; - class Content_Impl; /** diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 91cf9934ae94..58dbc00feb45 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -58,7 +58,6 @@ namespace ucbhelper { - class ContentProviderImplHelper; /** diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 702febc060ee..25969f17ae4e 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -33,7 +33,6 @@ namespace ucbhelper struct ContentIdentifier_Impl; - /** * This class implements a simple identifier object for UCB contents. * It mainly stores and returns the URL as it was passed to the constructor - diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index 929a9202c849..acf778e1c8af 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -32,11 +32,9 @@ namespace ucbhelper { - // class PropertySetInfo. - class ContentImplHelper; /** @@ -100,11 +98,9 @@ public: }; - // class CommandProcessorInfo. - /** * This class provides a command info ( the complete implementation of * the interface XCommandInfo ) for an object derived from class diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 4a4ead773d79..483be3405336 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -31,14 +31,12 @@ #include <ucbhelper/getcomponentcontext.hxx> - #define CPPU_TYPE( T ) cppu::UnoType<T>::get() #define CPPU_TYPE_REF( T ) CPPU_TYPE( T ) // XTypeProvider impl. internals - #define XTYPEPROVIDER_COMMON_IMPL( Class ) \ css::uno::Sequence< sal_Int8 > SAL_CALL \ Class::getImplementationId() \ @@ -69,11 +67,9 @@ Class::getTypes() \ } - // XTypeProvider impl. - // 2 interfaces supported #define XTYPEPROVIDER_IMPL_2( Class, I1,I2 ) \ XTYPEPROVIDER_COMMON_IMPL( Class ) \ @@ -163,7 +159,6 @@ GETTYPES_IMPL_END // XServiceInfo impl. internals - #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ throw( css::uno::RuntimeException, std::exception ) \ @@ -211,11 +206,9 @@ Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFacto } - // XServiceInfo impl. - #define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \ css::uno::Reference< css::lang::XSingleServiceFactory > \ Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ) \ diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index 691936286df6..8781a7d81725 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -44,7 +44,6 @@ namespace ucbhelper { class PropertyValues; - /** * This class implements the interface XRow. After construction of a valueset * the user can append properties ( incl. its values ) to the set. This class diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index 0941e085f530..039089fa63d7 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -34,7 +34,6 @@ #include <ucbhelper/ucbhelperdllapi.h> - namespace com { namespace sun { namespace star { namespace ucb { class XPropertySetRegistry; class XPersistentPropertySet; @@ -45,7 +44,6 @@ namespace ucbhelper_impl { struct ContentProviderImplHelper_Impl; } namespace ucbhelper { - class ContentImplHelper; typedef rtl::Reference< ContentImplHelper > ContentImplHelperRef; typedef std::list< ContentImplHelperRef > ContentRefList; diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 63dec4212149..4f002deb9620 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -42,11 +42,9 @@ namespace ucbhelper { - #define RESULTSET_SERVICE_NAME "com.sun.star.ucb.ContentResultSet" - class ResultSetDataSupplier; struct ResultSet_Impl; @@ -414,7 +412,6 @@ public: }; - /** * This is the base class for an object that supplies data to a result set * diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 1420b702305b..04e6f6dd36d3 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -38,11 +38,9 @@ namespace cppu { namespace ucbhelper { - #define DYNAMICRESULTSET_SERVICE_NAME "com.sun.star.ucb.DynamicResultSet" - /** * This is an abstract base class for implementations of the service * com.sun.star.ucb.DynamicResultSet, which is the result of the command diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index cda709eb045e..9ac6996f4a97 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -44,7 +44,6 @@ namespace ucbhelper { - /** * This is a structure that holds additional meta data for one column * of a resultset. The default values set in the constructor should be a @@ -129,7 +128,6 @@ ResultSetColumnData::ResultSetColumnData() } - /** * This is an implementation of the interface XResultSetMetaData. It can be * used to implement the interface diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index bd3ffdd06e9a..2c9aad29254b 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -34,11 +34,9 @@ #include <vector> - typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumerationHelper_BASE; - /** A wrapper that holds a com.sun.star.container.XIndexAccess and provides a com.sun.star.container.XEnumeration. @@ -72,7 +70,6 @@ private: }; - /** A wrapper that holds a com.sun.star.container.XEnumeration or a com.sun.star.container.XIndexAccess and provides an enumeration of VBA objects. @@ -116,7 +113,6 @@ protected: }; - // deprecated, use SimpleEnumerationBase instead! class VBAHELPER_DLLPUBLIC EnumerationHelperImpl : public EnumerationHelper_BASE { @@ -134,7 +130,6 @@ public: // only requirement is the object needs to implement XName - typedef ::cppu::WeakImplHelper< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE; template< typename OneIfc > diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index dd2cfba96461..6bfb8fd8bb83 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { } } } - typedef ::cppu::WeakImplHelper< css::script::vba::XVBAEventProcessor, css::document::XEventListener, @@ -107,7 +106,6 @@ protected: const css::uno::Any& rUserData = css::uno::Any() ); - struct EventQueueEntry { sal_Int32 mnEventId; @@ -184,7 +182,6 @@ private: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index 21e718594b9d..1ec99155e270 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -108,7 +108,6 @@ public: }; - /** Helper macro to implement the method 'getServiceImplName()' of the 'ooo.vba.XHelperInterface' interface. Will return the class name as service implementation name. @@ -120,7 +119,6 @@ OUString classname::getServiceImplName() \ } - /** Helper macro to implement the method 'getServiceNames()' for a single service name. */ @@ -137,7 +135,6 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ } - /** Helper macro to declare the methods 'getServiceImplName()' and 'getServiceNames()' of the 'ooo.vba.XHelperInterface' interface in a class declaration. @@ -147,7 +144,6 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ virtual css::uno::Sequence< OUString > getServiceNames() override; - /** Helper macro to implement the methods 'getServiceImplName()' and 'getServiceNames()' of the 'ooo.vba.XHelperInterface' interface. Will return the class name as service implementation name. @@ -157,7 +153,6 @@ VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \ VBAHELPER_IMPL_GETSERVICENAMES( classname, servicename ) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 485bbe8375cb..3bee75c6bb1a 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -433,7 +433,6 @@ inline T* VclBuilder::get(const OString& sID) } - //helper baseclass to ease retro fitting dialogs/tabpages that load a resource //to load a .ui file instead // diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index edf0e04f7deb..8bc10969ecfe 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -68,7 +68,6 @@ VCL_DLLPUBLIC sal_uInt64 SAL_CALL vcl_crc64 ( ) SAL_THROW_EXTERN_C(); - VCL_DLLPUBLIC const sal_uInt64* vcl_get_crc64_table(); diff --git a/include/vcl/dibtools.hxx b/include/vcl/dibtools.hxx index c9e98c4c03b8..51529be2d1cc 100644 --- a/include/vcl/dibtools.hxx +++ b/include/vcl/dibtools.hxx @@ -56,7 +56,6 @@ bool VCL_DLLPUBLIC ReadDIBV5( SvStream& rIStm); - bool VCL_DLLPUBLIC WriteDIB( // WriteDIB(rBitmap, rOStm, false, true); const Bitmap& rSource, SvStream& rOStm, @@ -73,5 +72,4 @@ sal_uInt32 getDIBV5HeaderSize(); #endif // INCLUDED_VCL_DIBTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index cf44a66b1a36..1b3a2b32148a 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -350,7 +350,6 @@ public: }; - inline void DockingWindow::RollDown() { if ( mpFloatWin ) diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 0f855a35b00f..419e873b9d3c 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -346,7 +346,6 @@ public: const Date& GetMax() const { return maMax; } - // MT: Remove these methods too, ExtDateFormat should be enough! // What should happen if using DDMMYYYY, but ShowCentury=false? diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index ea31f0dd5bb3..592c70714bfd 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -40,7 +40,6 @@ void VCL_DLLPUBLIC clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource); bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource); - #endif // INCLUDED_VCL_GDIMETAFILETOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 9b3e3e746472..0cbad6c7a3fb 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -131,7 +131,6 @@ enum class GraphicFileFormat // - GraphicDescriptor - - class VCL_DLLPUBLIC GraphicDescriptor { SvStream* pFileStm; diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx index f6c50f2e457d..0254bb731309 100644 --- a/include/vcl/imagerepository.hxx +++ b/include/vcl/imagerepository.hxx @@ -30,7 +30,6 @@ namespace vcl { - //= ImageRepository // provides access to the application's image repository (image.zip) diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx index acecf5e62a6c..1574704158ed 100644 --- a/include/vcl/mnemonicengine.hxx +++ b/include/vcl/mnemonicengine.hxx @@ -35,7 +35,6 @@ namespace vcl { - //= IMnemonicEntryList /// callback for a MnemonicEngine diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 37165181fbb7..dbbed2dff45c 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -53,7 +53,6 @@ struct VCL_DLLPUBLIC PPDValue }; - /* * PPDKey - a container for the available options (=values) of a PPD keyword */ @@ -112,7 +111,6 @@ struct PPDKeyhash }; - /* * PPDParser - parses a PPD file and contains all available keys from it */ @@ -241,7 +239,6 @@ public: }; - /* * PPDContext - a class to manage user definable states based on the * contents of a PPDParser. diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 590e504d2ac1..10ef17562fc9 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -72,7 +72,6 @@ public: }; - class VCL_DLLPUBLIC QueueInfo { friend class Printer; @@ -108,7 +107,6 @@ enum PrinterTransparencyMode }; - enum PrinterGradientMode { PRINTER_GRADIENT_STRIPES = 0, @@ -116,7 +114,6 @@ enum PrinterGradientMode }; - enum PrinterBitmapMode { PRINTER_BITMAP_OPTIMAL = 0, @@ -125,7 +122,6 @@ enum PrinterBitmapMode }; - class VCL_DLLPUBLIC PrinterOptions { private: diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 6037bdcfb1dc..3a63cd3d539c 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -66,7 +66,6 @@ typedef const sal_uInt8* ConstScanline; #define BMP_SCANLINE_FORMAT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x7FFFFFFFUL ) - #define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col ) \ const sal_uInt8 _def_cR = static_cast<sal_uInt8>( d_RS < 0 ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ const sal_uInt8 _def_cG = static_cast<sal_uInt8>( d_GS < 0 ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ @@ -76,7 +75,6 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnO (sal_uInt8) ( _def_cB | ( ( _def_cB & maB.mnOr ) >> maB.mnOrShift ) ) ); - #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_ALPHA ) \ ( ( ( ( d_RS < 0L ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ ( (sal_uInt32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | \ @@ -415,9 +413,6 @@ inline sal_uInt8 BitmapColor::GetLuminance() const } - - - inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uInt8 cTransparency ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); @@ -430,7 +425,6 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uIn } - inline sal_uInt16 BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx index 43a6adc9a65d..ee6862ced477 100644 --- a/include/vcl/txtattr.hxx +++ b/include/vcl/txtattr.hxx @@ -59,7 +59,6 @@ public: }; - class VCL_DLLPUBLIC TextAttribFontColor : public TextAttrib { private: diff --git a/include/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx index 59f04df2abd9..702bb1a6c268 100644 --- a/include/xmloff/PageMasterStyleMap.hxx +++ b/include/xmloff/PageMasterStyleMap.hxx @@ -25,7 +25,6 @@ #include <xmloff/contextid.hxx> - #define XML_PM_TYPE_PAGESTYLELAYOUT (XML_PM_TYPES_START + 0) #define XML_PM_TYPE_NUMFORMAT (XML_PM_TYPES_START + 1) #define XML_PM_TYPE_NUMLETTERSYNC (XML_PM_TYPES_START + 2) diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index 79f4d1dc05af..068cc351130c 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -54,7 +54,6 @@ class SvXMLImportContext; class SvXMLImport; - /** With this class you can import a <chart:chart> element containing its data as <table:table> element or without internal table. In the latter case you have to provide a table address mapper that diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index b8a0da555c66..d3aec1c7e230 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -28,7 +28,6 @@ struct SvXMLEnumMapEntry; - /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index d52f1bf50ec4..27aa216092f9 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -42,7 +42,6 @@ class XMLPropertySetMapper; class SvXMLExportPropertyMapper; - struct XMLPageExportNameEntry { OUString sPageMasterName; @@ -50,7 +49,6 @@ struct XMLPageExportNameEntry }; - class XMLOFF_DLLPUBLIC XMLPageExport : public salhelper::SimpleReferenceObject { SvXMLExport& rExport; diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index 346553a0a057..e5052a1aea01 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -29,7 +29,6 @@ namespace xmloff { - //= XMLExporter class SAL_NO_VTABLE XMLSettingsExportContext diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 8b4ea5cba459..26bdb2e3838c 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -40,7 +40,6 @@ namespace xmloff { - //= OFormLayerXMLImport class OFormLayerXMLImport_Impl; diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx index 212b771ecfe2..8a292008183e 100644 --- a/include/xmloff/maptype.hxx +++ b/include/xmloff/maptype.hxx @@ -25,7 +25,6 @@ #include <unotools/saveopt.hxx> - /** Represents a property with its API-name, its XML-name and the type of its value. */ @@ -99,7 +98,6 @@ struct XMLPropertyMapEntry }; - /** Smart struct to transport an Any with an index to the appropriate property-name */ diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index b347ec4f9613..8c476593a2cb 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -46,7 +46,6 @@ class XMLPropertySetMapper; class SvXMLImportPropertyMapper; - enum SdXMLGroupShapeElemTokenMap { XML_TOK_GROUP_GROUP, @@ -199,7 +198,6 @@ public: }; - class SdXML3DSceneAttributesHelper { protected: @@ -243,7 +241,6 @@ public: }; - class SvXMLShapeContext : public SvXMLImportContext { protected: @@ -262,7 +259,6 @@ public: }; - class ShapeSortContext; struct XMLShapeImportHelperImpl; struct XMLShapeImportPageContextImpl; diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 7878e27c2a46..de1908f2d8bc 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -122,7 +122,6 @@ public: getPropertySetMapper() const; - /** implementation helper for FillPropertySet: fill an XPropertySet. * Exceptions will be asserted. */ static bool _FillPropertySet( diff --git a/include/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx index c8d88b273fb2..391f8a67a6a4 100644 --- a/include/xmloff/xmlmultiimagehelper.hxx +++ b/include/xmloff/xmlmultiimagehelper.hxx @@ -24,7 +24,6 @@ #include <xmloff/xmlimp.hxx> - class MultiImageImportHelper { private: @@ -55,7 +54,6 @@ public: }; - #endif // INCLUDED_XMLOFF_XMLMULTIIMAGEHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 3ece1bc82400..0f9d19a02331 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -118,7 +118,6 @@ public: void SetWasUsed(const css::uno::Sequence<sal_Int32>& rWasUsed); - // two methods to allow the field import/export to treat system languages // properly: diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx index c2c9d8e5aabb..bc46a978a859 100644 --- a/include/xmloff/xmlprhdl.hxx +++ b/include/xmloff/xmlprhdl.hxx @@ -31,7 +31,6 @@ class SvXMLUnitConverter; struct XMLPropertyState; - /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index d0cbf9fbca88..a82bd4c1c9ff 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -147,7 +147,6 @@ void OTextInputStream::implResizeBuffer() } - // XTextInputStream OUString OTextInputStream::readLine( ) @@ -414,7 +413,6 @@ void OTextInputStream::closeInput( ) } - // XActiveDataSink void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream ) diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx index f3533ef1c4a7..684d2fe7349f 100644 --- a/io/source/TextOutputStream/TextOutputStream.cxx +++ b/io/source/TextOutputStream/TextOutputStream.cxx @@ -158,7 +158,6 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource ) } - // XTextOutputStream void OTextOutputStream::writeString( const OUString& aString ) @@ -223,7 +222,6 @@ void OTextOutputStream::checkOutputStream() } - // XActiveDataSource void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream ) diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 74baf3b2651a..87f47dcace20 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -66,7 +66,6 @@ namespace io_acceptor }; - PipeConnection::PipeConnection( const OUString &sConnectionDescription) : m_nStatus( 0 ), m_sDescription( sConnectionDescription ) diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index 2995aad0a24b..2c0d3f691b2f 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -223,7 +223,6 @@ namespace stoc_connector { } - // XConnectionBroadcaster void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception) { diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 878e0dfffd91..5b61d14e919c 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -92,7 +92,6 @@ public: // XDataInputStream virtual OUString SAL_CALL readUTF() throw (IOException, RuntimeException, std::exception) override; - public: // XActiveDataSink virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) override; @@ -207,8 +206,6 @@ void ODataInputStream::closeInput() } - - //== XDataInputStream =========================================== // XDataInputStream @@ -384,7 +381,6 @@ OUString ODataInputStream::readUTF() throw (IOException, RuntimeException, std:: } - // XActiveDataSource void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) @@ -406,7 +402,6 @@ Reference< XInputStream > ODataInputStream::getInputStream() throw (RuntimeExcep } - // XDataSink void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception) { @@ -491,8 +486,6 @@ Sequence<OUString> ODataInputStream_getSupportedServiceNames() } - - class ODataOutputStream : public WeakImplHelper < XDataOutputStream, @@ -796,8 +789,6 @@ Reference< XOutputStream > ODataOutputStream::getOutputStream() } - - // XDataSink void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception) @@ -839,7 +830,6 @@ Reference < XConnectable > ODataOutputStream::getPredecessor() throw (RuntimeEx } - // XServiceInfo OUString ODataOutputStream::getImplementationName() throw (std::exception) { @@ -1056,7 +1046,6 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj } - void OObjectOutputStream::connectToMarkable() { if( ! m_bValidMarkable ) { @@ -1133,8 +1122,6 @@ sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark) } - - Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( SAL_UNUSED_PARAMETER const Reference < XComponentContext > & ) throw(Exception) diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index c653efb87c08..55c2fcdd8fc4 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -316,7 +316,6 @@ sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark) } - // XActiveDataSource2 void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& aStream) throw (RuntimeException, std::exception) @@ -336,7 +335,6 @@ Reference< XOutputStream > OMarkableOutputStream::getOutputStream() throw (Runti } - void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r ) throw (RuntimeException, std::exception) { @@ -456,16 +454,9 @@ Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames() } - - - - - - // XMarkableInputStream - class OMarkableInputStream : public WeakImplHelper < @@ -565,8 +556,6 @@ OMarkableInputStream::~OMarkableInputStream() } - - // XInputStream sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) @@ -807,11 +796,6 @@ sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark) } - - - - - // XActiveDataSource void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStream) throw (RuntimeException, std::exception) @@ -834,7 +818,6 @@ Reference< XInputStream > OMarkableInputStream::getInputStream() throw (RuntimeE } - // XDataSink void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r ) throw (RuntimeException, std::exception) @@ -876,8 +859,6 @@ Reference< XConnectable > OMarkableInputStream::getPredecessor() throw (Runtime } - - void OMarkableInputStream::checkMarksAndFlush() { map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii; diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index ec7b70320700..8e3ecd2f2b67 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -122,7 +122,6 @@ private: }; - OPipeImpl::OPipeImpl() { m_nBytesToSkip = 0; @@ -384,8 +383,6 @@ Reference < XConnectable > OPipeImpl::getPredecessor() throw( RuntimeException, } - - // XServiceInfo OUString OPipeImpl::getImplementationName() throw(std::exception ) { diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 3386ba48966f..8cf275620862 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -199,7 +199,6 @@ void Pump::fireTerminated() } - void Pump::close() { // close streams and release references @@ -301,7 +300,6 @@ void Pump::run() } - /* * XConnectable */ @@ -313,7 +311,6 @@ void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw(std::e } - Reference< XConnectable > Pump::getPredecessor() throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -321,7 +318,6 @@ Reference< XConnectable > Pump::getPredecessor() throw(std::exception) } - void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -329,7 +325,6 @@ void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw(std::exc } - Reference< XConnectable > Pump::getSuccessor() throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -337,7 +332,6 @@ Reference< XConnectable > Pump::getSuccessor() throw(std::exception) } - /* * XActiveDataControl */ @@ -348,14 +342,12 @@ void Pump::addListener( const Reference< XStreamListener >& xListener ) throw(st } - void Pump::removeListener( const Reference< XStreamListener >& xListener ) throw(std::exception) { m_cnt.removeInterface( xListener ); } - void Pump::start() throw( RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_aMutex ); @@ -375,7 +367,6 @@ void Pump::start() throw( RuntimeException, std::exception ) } - void Pump::terminate() throw(std::exception) { close(); @@ -389,7 +380,6 @@ void Pump::terminate() throw(std::exception) } - /* * XActiveDataSink */ @@ -405,7 +395,6 @@ void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw(std: } - Reference< XInputStream > Pump::getInputStream() throw(std::exception) { Guard< Mutex > aGuard( m_aMutex ); @@ -413,7 +402,6 @@ Reference< XInputStream > Pump::getInputStream() throw(std::exception) } - /* * XActiveDataSource */ diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index e6cc3238f84c..283344c271ee 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -95,8 +95,6 @@ protected: }; - - void ODataStreamTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) @@ -220,7 +218,6 @@ sal_Int32 ODataStreamTest::test( } - sal_Bool ODataStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -323,7 +320,6 @@ void ODataStreamTest::testSimple( const Reference < XDataInputStream > &rInput } - /** * for external binding * @@ -440,7 +436,6 @@ public: }; - Reference <XPropertySetInfo > MyPersistObject::getPropertySetInfo() throw (RuntimeException) { @@ -566,8 +561,6 @@ void MyPersistObject::removeVetoableChangeListener( } - - OUString MyPersistObject::getServiceName() throw (RuntimeException) { return m_sServiceName; @@ -887,7 +880,6 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > ERROR_ASSERT( rIn.is() , "no objectInputStream" ); - // tests, if saving an object with an unknown service name allows // reading the data behind the object ! { @@ -1035,9 +1027,6 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > markableOut->jumpToFurthest(); - - - ERROR_ASSERT( 0 != rIn->available() , "no data arrived at input" ); Reference < XPersistObject > xReadPersistRef = rIn->readObject( ); diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index c8d2d1997299..8892e7338330 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -95,8 +95,6 @@ OMarkableOutputStreamTest::~OMarkableOutputStreamTest() } - - void OMarkableOutputStreamTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -171,7 +169,6 @@ sal_Int32 OMarkableOutputStreamTest::test( } - sal_Bool OMarkableOutputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -357,9 +354,6 @@ void OMarkableOutputStreamTest::testSimple( const Reference< XOutputStream > ****/ - - - /** * for external binding * @@ -372,7 +366,6 @@ Reference < XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( cons } - Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames() throw () { Sequence<OUString> aRet { OMarkableOutputStreamTest_getImplementationName() }; @@ -391,12 +384,6 @@ OUString OMarkableOutputStreamTest_getImplementationName() throw () } - - - - - - // Input stream @@ -456,7 +443,6 @@ OMarkableInputStreamTest::~OMarkableInputStreamTest() } - void OMarkableInputStreamTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -537,7 +523,6 @@ sal_Int32 OMarkableInputStreamTest::test( } - sal_Bool OMarkableInputStreamTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -628,9 +613,6 @@ void OMarkableInputStreamTest::testSimple( const Reference< XOutputStream > ****/ - - - /** * for external binding * @@ -643,7 +625,6 @@ Reference < XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const } - Sequence<OUString> OMarkableInputStreamTest_getSupportedServiceNames() throw () { Sequence<OUString> aRet { OMarkableInputStreamTest_getImplementationName() }; diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx index d66b3c751985..a2f65da199bd 100644 --- a/io/test/stm/pipetest.cxx +++ b/io/test/stm/pipetest.cxx @@ -90,7 +90,6 @@ private: }; - class OPipeTest : public WeakImplHelper < XSimpleTest > { public: @@ -129,7 +128,6 @@ private: }; - OPipeTest::OPipeTest( const Reference< XMultiServiceFactory > &rFactory ) { @@ -141,7 +139,6 @@ OPipeTest::~OPipeTest() } - void OPipeTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -205,7 +202,6 @@ sal_Int32 OPipeTest::test( } - sal_Bool OPipeTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -356,7 +352,6 @@ void OPipeTest::testBufferResizing( const Reference < XInterface > &r ) } - void OPipeTest::testMultithreading( const Reference < XInterface > &r ) { @@ -394,7 +389,6 @@ void OPipeTest::testMultithreading( const Reference < XInterface > &r ) } - /** * for external binding * @@ -408,7 +402,6 @@ Reference < XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMu } - Sequence<OUString> OPipeTest_getSupportedServiceNames() throw() { Sequence<OUString> aRet { OPipeTest_getServiceName() }; diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx index ae2a28bebf38..898805b068df 100644 --- a/io/test/stm/pumptest.cxx +++ b/io/test/stm/pumptest.cxx @@ -41,8 +41,6 @@ #include <list> - - using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star::uno; @@ -111,7 +109,6 @@ OPumpTest::~OPumpTest() } - void OPumpTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -189,7 +186,6 @@ sal_Int32 OPumpTest::test( } - sal_Bool OPumpTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -317,7 +313,6 @@ private: }; - void OPumpTest::testClose( const Reference< XInterface > &r ) { TestCase t( m_rSmgr, r ); diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx index 1703526c0605..fd1e3d7e5e31 100644 --- a/io/test/testcomponent.cxx +++ b/io/test/testcomponent.cxx @@ -18,7 +18,6 @@ */ - // testcomponent - Loads a service and its testcomponent from dlls performs a test. // Expands the dll-names depending on the actual environment. // Example : testcomponent com.sun.star.io.Pipe stm diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 38cf44662015..69a2bdeccfb8 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -111,9 +111,6 @@ void MyThread::run() } - - - void testConnection( const OUString &sConnectionDescription , const Reference < XAcceptor > &rAcceptor, const Reference < XConnector > &rConnector ) diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx index f96b094f6fb8..5ebd4c4e209c 100644 --- a/jvmfwk/inc/vendorplugin.hxx +++ b/jvmfwk/inc/vendorplugin.hxx @@ -59,7 +59,6 @@ typedef enum } javaPluginError; - /** obtains information about installations of Java Runtime Environments (JREs). <p>The function gathers information about available JREs which have the same @@ -171,7 +170,6 @@ javaPluginError jfw_plugin_getJavaInfoByPath( JavaInfo ** ppInfo); - /** obtains information for a JRE referenced by the JAVA_HOME environment variable. <p>If the JAVA_HOME environment variable is set and points to a JRE whoose vendor @@ -299,7 +297,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( JNIEnv ** ppEnv); - /** checks if the installation of the jre still exists. This function checks if the JRE described by pInfo still diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 52d1a3c36660..667b2875cd85 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -497,8 +497,6 @@ javaPluginError jfw_plugin_getJavaInfosFromPath( } - - #if defined(WNT) // Load msvcr71.dll using an explicit full path from where it is diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index f16f96fdf098..25ae2a4fa4ca 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -138,7 +138,6 @@ bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome); bool decodeOutput(const OString& s, OUString* out); - namespace { @@ -217,8 +216,6 @@ rtl::Bootstrap * getBootstrap() } - - class FileHandleGuard: private boost::noncopyable { public: @@ -688,7 +685,6 @@ bool getJavaInfoFromRegistry(const wchar_t* szRegKey, } - bool getSDKInfoFromRegistry(vector<OUString> & vecHome) { return getJavaInfoFromRegistry(HKEY_SUN_SDK, vecHome); @@ -1252,7 +1248,6 @@ void addJavaInfosDirScan( RTL_TEXTENCODING_UTF8); - for( int ii = 0; ii < cSearchPaths; ii ++) { OUString usDir1("file:///" + arPaths[ii]); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index 5ee17d7bd869..9b580ccaa8fb 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -49,7 +49,6 @@ MalformedVersionException::operator =( } - VendorBase::VendorBase(): m_bAccessibility(false) { } diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index 30cd00e80f75..2c7d1667f4fb 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -168,7 +168,6 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave) } - VersionInfo::VersionInfo(): arVersions(nullptr) { } @@ -1057,7 +1056,6 @@ void MergedSettings::merge(const NodeJava & share, const NodeJava & user) } - JavaInfo * MergedSettings::createJavaInfo() const { return m_javaInfo.makeJavaInfo(); diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx index fcd687c2ff68..b81634376b4c 100644 --- a/jvmfwk/source/framework.hxx +++ b/jvmfwk/source/framework.hxx @@ -79,7 +79,6 @@ public: ::JavaInfo * pInfo; - CJavaInfo(); CJavaInfo(const CJavaInfo &); ~CJavaInfo(); diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx index a8efc2a119ea..1a86cb9f6a1a 100644 --- a/jvmfwk/source/fwkbase.hxx +++ b/jvmfwk/source/fwkbase.hxx @@ -71,7 +71,6 @@ OUString getClasspathUrls(); } //end namespace - enum JFW_MODE { JFW_MODE_APPLICATION, diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index 73b4de3b9bae..d2fe64e391a5 100644 --- a/jvmfwk/source/libxmlutil.cxx +++ b/jvmfwk/source/libxmlutil.cxx @@ -87,8 +87,6 @@ CXmlDocPtr & CXmlDocPtr::operator = (xmlDoc* pObj) } - - CXmlCharPtr::CXmlCharPtr(xmlChar * aChar) : _object(aChar) { @@ -131,8 +129,6 @@ CXmlCharPtr::operator OUString() } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx index 355f4c5c52e5..10b17e60bd52 100644 --- a/l10ntools/inc/cfgmerge.hxx +++ b/l10ntools/inc/cfgmerge.hxx @@ -30,7 +30,6 @@ typedef std::unordered_map<OString, OString, OStringHash> OStringHashMap; - // class CfgStackData diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index c99e0b846738..00e4c3cd8aed 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -98,7 +98,6 @@ public: }; - // class Export diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index 50c2a15bd2f8..ba6adf5bf61d 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -391,7 +391,6 @@ void CfgExport::WorkOnText( } - // class CfgMerge diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 230f6a62f7fb..de35396068ba 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -146,7 +146,6 @@ int GetError() // class XRMResParser - XRMResParser::XRMResParser() : bError( false ), bText( false ) diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index d04e4f166f2c..a729501a6b7f 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -161,7 +161,6 @@ bool IsConvDic( const OUString &rFileURL, sal_Int16 &nLang, sal_Int16 &nConvType } - ConvDic::ConvDic( const OUString &rName, sal_Int16 nLang, @@ -675,5 +674,4 @@ uno::Sequence< OUString > ConvDic::getSupportedServiceNames_Static() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 534b163c5122..62843b2e6225 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -288,7 +288,6 @@ void ConvDicXMLRightTextContext_Impl::EndElement() } - bool ConvDicXMLExport::Export() { uno::Reference< document::XExporter > xExporter( this ); diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index cabbc3fe8a38..0c581d747cc8 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - #define BUFSIZE 4096 #define VERS2_NOLANGUAGE 1024 @@ -1148,5 +1147,4 @@ OUString SAL_CALL DicEntry::getReplacementText( ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index e443d901273a..dd5c063fad5c 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -167,7 +167,6 @@ public: }; - class DicEntry : public cppu::WeakImplHelper< css::linguistic2::XDictionaryEntry > { @@ -198,7 +197,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 525da700f7b4..d70fee68be71 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -52,7 +52,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - static bool IsVers2OrNewer( const OUString& rFileURL, sal_uInt16& nLng, bool& bNeg ); static void AddInternal( const uno::Reference< XDictionary > &rDic, @@ -228,8 +227,6 @@ bool DicEvtListenerHelper::RemoveDicListEvtListener( } - - sal_Int16 DicEvtListenerHelper::EndCollectEvents() { DBG_ASSERT(nNumCollectEvtListeners > 0, "lng: mismatched function call"); @@ -271,8 +268,6 @@ sal_Int16 DicEvtListenerHelper::FlushEvents() } - - void DicList::MyAppExitListener::AtExit() { rMyDicList.SaveDics(); diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 50d2bf50ac5c..92e27b2a36f3 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1066,8 +1066,6 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl() } - - sal_Bool SAL_CALL GrammarCheckingIterator::supportsService( const OUString & rServiceName ) throw(uno::RuntimeException, std::exception) diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index a93957931fb1..101e9c07955e 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -43,7 +43,6 @@ #include "defs.hxx" - struct FPEntry { // flat paragraph iterator @@ -70,8 +69,6 @@ struct FPEntry }; - - class GrammarCheckingIterator: public cppu::WeakImplHelper < @@ -183,7 +180,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 34ceecf1c9b5..5ab1e8785fe3 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -70,7 +70,6 @@ sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) throw (RuntimeException) } - bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType ) { bool bIsAll = true; @@ -83,7 +82,6 @@ bool TextIsAllScriptType( const OUString &rTxt, sal_Int16 nScriptType ) } - HHConvDic::HHConvDic( const OUString &rName, const OUString &rMainURL ) : ConvDic( rName, LANGUAGE_KOREAN, ConversionDictionaryType::HANGUL_HANJA, true, rMainURL ) { diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 0ab84859f81a..5ed22c5fc929 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -47,7 +47,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - HyphenatorDispatcher::HyphenatorDispatcher( LngSvcMgr &rLngSvcMgr ) : rMgr (rLngSvcMgr) { diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 9623e07d5a82..39b7030ca701 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -138,8 +138,6 @@ inline css::uno::Reference< css::linguistic2::XSearchableDictionaryList > } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 844b2fbd4442..0eb88f1837de 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -119,8 +119,6 @@ sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling() } - - PossibleHyphens::PossibleHyphens(const OUString &rWord, sal_Int16 nLang, const OUString &rHyphWord, const Sequence< sal_Int16 > &rPositions) : @@ -184,7 +182,6 @@ css::uno::Reference < css::linguistic2::XPossibleHyphens > PossibleHyphens::Crea } - } // namespace linguistic /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index c3291c0b9bcc..a83cb6bc0d81 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -187,7 +187,6 @@ void SAL_CALL FlushListener::propertyChange( } - SpellCache::SpellCache() { pFlushLstnr = new FlushListener( *this ); diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index d43f9f0c2e93..e77017c6a0ca 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -138,7 +138,6 @@ OUString LinguOptions::GetName( sal_Int32 nWID ) } - //! map must be sorted by first entry in alphabetical increasing order. static const SfxItemPropertyMapEntry* lcl_GetLinguProps() { diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 13a705d9fc9c..07ae705c2ec0 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -43,7 +43,6 @@ namespace com { namespace sun { namespace star { }}} - // LinguOptions // This class represents all Linguistik relevant options. diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 097756c7b0ac..831ac4e4bead 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -311,7 +311,6 @@ sal_Bool SAL_CALL } - PropertyHelper_Thes::PropertyHelper_Thes( const Reference< XInterface > &rxSource, Reference< XLinguProperties > &rxPropSet ) : @@ -336,7 +335,6 @@ void SAL_CALL } - // list of properties from the property set to be used // and listened to static const char *aSP[] = diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index a1c06675a51b..7a2808e9eb84 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -444,8 +444,6 @@ bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster( } - - LngSvcMgr::LngSvcMgr() : utl::ConfigItem("Office.Linguistic") , aEvtListeners(GetLinguMutex()) @@ -1887,7 +1885,6 @@ static uno::Sequence< OUString > GetLangSvc( const uno::Any &rVal ) } - uno::Sequence< OUString > SAL_CALL LngSvcMgr::getConfiguredServices( const OUString& rServiceName, diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 0eee0605eddd..1fc85a5a98e5 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -54,7 +54,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { } } } } - class LngSvcMgr : public cppu::WeakImplHelper < @@ -190,7 +189,6 @@ inline OUString LngSvcMgr::getImplementationName_Static() } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 2757d47b7030..5c09ae84a3a6 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -858,7 +858,6 @@ void SpellCheckerDispatcher::setCharClass(const LanguageTag& rLanguageTag) } - OUString SAL_CALL SpellCheckerDispatcher::makeLowerCase(const OUString& aTerm, CharClass * pCC) { if (pCC) diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index ffe86417b947..bb62a5a059d4 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -176,7 +176,6 @@ Sequence< OUString > MergeProposalSeqs( } - SpellAlternatives::SpellAlternatives() { nLanguage = LANGUAGE_NONE; diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index e38a30f35860..3e81ed8e9fd8 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -39,7 +39,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - static bool SvcListHasLanguage( const Sequence< Reference< XThesaurus > > &rRefs, const Locale &rLocale ) @@ -58,7 +57,6 @@ static bool SvcListHasLanguage( } - ThesaurusDispatcher::ThesaurusDispatcher() { } diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 37c17b0f30e3..cf75d4994ed1 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -43,7 +43,6 @@ #include "lngopt.hxx" - class ThesaurusDispatcher : public cppu::WeakImplHelper< css::linguistic2::XThesaurus >, public LinguDispatcher @@ -99,7 +98,6 @@ inline css::uno::Reference< css::linguistic2::XLinguProperties > } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 642a92b92f10..8ff57ef41601 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -39,8 +39,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - - PropertyChgHelper::PropertyChgHelper( const Reference< XInterface > & rxSource, Reference< XPropertySet > &rxPropSet, diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx index d2dc229ba9e1..01f223de3f02 100644 --- a/linguistic/workben/sprophelp.hxx +++ b/linguistic/workben/sprophelp.hxx @@ -102,8 +102,6 @@ public: }; - - class PropertyHelper_Spell : public PropertyChgHelper { diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 5310fe5dbde2..2cc3f46921bf 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star::linguistic2; using namespace linguistic; - sal_Bool operator == ( const Locale &rL1, const Locale &rL2 ) { return rL1.Language == rL2.Language && @@ -51,7 +50,6 @@ sal_Bool operator == ( const Locale &rL1, const Locale &rL2 ) } - SpellChecker::SpellChecker() : aEvtListeners ( GetLinguMutex() ) { @@ -477,5 +475,4 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index cb9232a9ad0a..ea9a6ff63545 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::linguistic2; - class SpellChecker : public cppu::WeakImplHelper < @@ -153,7 +152,6 @@ inline OUString SpellChecker::getImplementationName_Static() throw() } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfendnote.hxx b/lotuswordpro/source/filter/xfilter/xfendnote.hxx index f73aaad500ba..6ab23422865a 100644 --- a/lotuswordpro/source/filter/xfilter/xfendnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xfendnote.hxx @@ -88,7 +88,6 @@ inline XFEndNote::XFEndNote() } - inline void XFEndNote::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx index e3cdbb849828..fae8206e4993 100644 --- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx @@ -67,6 +67,4 @@ XFFontDecl::XFFontDecl(const OUString& name, const OUString& family, bool fixed) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xffootnote.hxx b/lotuswordpro/source/filter/xfilter/xffootnote.hxx index 27f7d22652a1..d80b14d9ccdc 100644 --- a/lotuswordpro/source/filter/xfilter/xffootnote.hxx +++ b/lotuswordpro/source/filter/xfilter/xffootnote.hxx @@ -88,7 +88,6 @@ inline XFFootNote::XFFootNote() } - inline void XFFootNote::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx index 39c4e757daf2..57e710d00a49 100644 --- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx @@ -160,6 +160,5 @@ inline void XFNumberStyle::SetSurfix(const OUString& surfix) } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 8eca48a9aa55..a4178c2d6836 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -55,7 +55,6 @@ using mysqlc_sdbc_driver::getStringFromAny; static std::string wild("%"); - void lcl_setRows_throw(const Reference< XResultSet >& _xResultSet,sal_Int32 _nType,const std::vector< std::vector< Any > >& _rRows) { Reference< XInitialization> xIni(_xResultSet,UNO_QUERY); diff --git a/o3tl/qa/cow_wrapper_clients.cxx b/o3tl/qa/cow_wrapper_clients.cxx index 82c73f170ab0..959bddf93413 100644 --- a/o3tl/qa/cow_wrapper_clients.cxx +++ b/o3tl/qa/cow_wrapper_clients.cxx @@ -104,7 +104,6 @@ bool cow_wrapper_client2::operator<( const cow_wrapper_client2& rRHS ) const } - cow_wrapper_client3::cow_wrapper_client3() : maImpl() { } @@ -171,7 +170,6 @@ bool cow_wrapper_client3::operator<( const cow_wrapper_client3& rRHS ) const } - namespace { struct theDefaultClient4 : public rtl::Static< o3tl::cow_wrapper< int >, theDefaultClient4 > {}; } diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx index 0166427838ea..471ca7e12dfb 100644 --- a/o3tl/qa/test-sorted_vector.cxx +++ b/o3tl/qa/test-sorted_vector.cxx @@ -260,7 +260,6 @@ public: } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx index aa6c94eaceb2..acafdb3bc84c 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx @@ -364,7 +364,6 @@ void OConnection::buildTypeInfo() throw( SQLException) aInfo.nNumPrecRadix = (sal_Int16)xRow->getInt(18); - // Now that we have the type info, save it // in the Hashtable if we don't already have an // entry for this SQL type. @@ -399,6 +398,4 @@ void OConnection::disposing() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx index 017faf0650fa..e51e3a05b2b5 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx @@ -884,6 +884,4 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx index 671fbd26794d..87dfee75c312 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx @@ -143,7 +143,6 @@ sal_Int32 SAL_CALL SkeletonDriver::getMinorVersion( ) throw(RuntimeException) } - namespace connectivity { namespace skeleton diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx index 1474d7a09e20..df2f32a73753 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx @@ -196,7 +196,6 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& } - void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -221,7 +220,6 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x } - void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -326,7 +324,6 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ } - void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -386,5 +383,4 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx index 40582fc07dd3..bcdc68ea00fd 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx @@ -267,7 +267,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw } - Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -314,7 +313,6 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept } - ::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -337,7 +335,6 @@ css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLE } - DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -869,6 +866,4 @@ void SAL_CALL OResultSet::release() throw() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx index 5f061e58dd13..e5cd379b3296 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx @@ -121,7 +121,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } - sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) { return sal_False; diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx index b3ccf08216bd..3579989c5835 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx @@ -57,12 +57,10 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) ); - // The required C-Api must be provided! // It contains of 3 special functions that have to be exported. - void REGISTER_PROVIDER( const OUString& aServiceImplName, const Sequence< OUString>& Services, @@ -80,7 +78,6 @@ void REGISTER_PROVIDER( } - struct ProviderRequest { Reference< XSingleServiceFactory > xRet; diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx index a79d9c184d3e..e34bf082187e 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx @@ -208,7 +208,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } - sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -241,7 +240,6 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } - Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -252,7 +250,6 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } - void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx index f5161f3b178b..fa3a5ffd2f30 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx @@ -65,7 +65,6 @@ namespace skeleton }; - typedef const sal_Char* (*PVFN)(); struct UStringDescription diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx index a00e22143605..72ce6b4f729f 100644 --- a/odk/examples/cpp/counter/countermain.cxx +++ b/odk/examples/cpp/counter/countermain.cxx @@ -60,7 +60,6 @@ using namespace com::sun::star::lang; using namespace ::rtl; - SAL_IMPLEMENT_MAIN() { try { diff --git a/odk/examples/cpp/custompanel/ctp_panel.hxx b/odk/examples/cpp/custompanel/ctp_panel.hxx index 098faba050f3..c811f24e6fb1 100644 --- a/odk/examples/cpp/custompanel/ctp_panel.hxx +++ b/odk/examples/cpp/custompanel/ctp_panel.hxx @@ -31,7 +31,6 @@ #include <cppuhelper/basemutex.hxx> - namespace sd { namespace colortoolpanel { diff --git a/odk/examples/cpp/custompanel/ctp_services.cxx b/odk/examples/cpp/custompanel/ctp_services.cxx index 4b96e2b14e55..d259028b1986 100644 --- a/odk/examples/cpp/custompanel/ctp_services.cxx +++ b/odk/examples/cpp/custompanel/ctp_services.cxx @@ -27,8 +27,6 @@ namespace sd { namespace colortoolpanel { - - //= descriptors for the services implemented in this component static struct ::cppu::ImplementationEntry s_aServiceEntries[] = diff --git a/onlineupdate/source/update/updater/nsWindowsRestart.cxx b/onlineupdate/source/update/updater/nsWindowsRestart.cxx index 27fe249e429f..486f0da1c3e5 100644 --- a/onlineupdate/source/update/updater/nsWindowsRestart.cxx +++ b/onlineupdate/source/update/updater/nsWindowsRestart.cxx @@ -457,7 +457,6 @@ FreeAllocStrings(int argc, wchar_t **argv) } - /** * Launch a child process with the specified arguments. * @note argv[0] is ignored diff --git a/oox/inc/drawingml/chart/axiscontext.hxx b/oox/inc/drawingml/chart/axiscontext.hxx index d551b805bfb2..81eb773ecf8e 100644 --- a/oox/inc/drawingml/chart/axiscontext.hxx +++ b/oox/inc/drawingml/chart/axiscontext.hxx @@ -27,7 +27,6 @@ namespace drawingml { namespace chart { - struct AxisDispUnitsModel; /** Handler for a value axis display units context (c:dispUnits element). @@ -42,7 +41,6 @@ public: }; - struct AxisModel; /** Base class for axis context handlers (c:catAx, c:dateAx, c:serAx, c:valAx @@ -58,7 +56,6 @@ public: }; - /** Handler for a category axis context (c:catAx element). */ class CatAxisContext : public AxisContextBase @@ -71,7 +68,6 @@ public: }; - /** Handler for a date axis context (c:dateAx element). */ class DateAxisContext : public AxisContextBase @@ -84,7 +80,6 @@ public: }; - /** Handler for a series axis context (c:serAx element). */ class SerAxisContext : public AxisContextBase @@ -97,7 +92,6 @@ public: }; - /** Handler for a value axis context (c:valAx element). */ class ValAxisContext : public AxisContextBase @@ -110,7 +104,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/axisconverter.hxx b/oox/inc/drawingml/chart/axisconverter.hxx index 3ef4f4e85878..4bf46b77a91c 100644 --- a/oox/inc/drawingml/chart/axisconverter.hxx +++ b/oox/inc/drawingml/chart/axisconverter.hxx @@ -32,7 +32,6 @@ namespace drawingml { namespace chart { - struct AxisDispUnitsModel; class AxisDispUnitsConverter : public ConverterBase< AxisDispUnitsModel > @@ -67,7 +66,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx index 8347e0de1887..4d3419e622f3 100644 --- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx +++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx @@ -28,7 +28,6 @@ namespace drawingml { namespace chart { - /** Relative shape position in a chart object. */ struct AnchorPosModel { @@ -40,7 +39,6 @@ struct AnchorPosModel }; - /** Absolute shape size in a chart object (in EMUs). */ struct AnchorSizeModel : public EmuSize { @@ -49,7 +47,6 @@ struct AnchorSizeModel : public EmuSize }; - /** Contains the position of a shape in the chart object. Supports different shape anchor modes (absolute, relative). */ @@ -76,7 +73,6 @@ private: typedef std::shared_ptr< ShapeAnchor > ShapeAnchorRef; - /** Handler for a chart drawing fragment (c:userShapes root element). */ class ChartDrawingFragment : public ::oox::core::FragmentHandler2 @@ -105,7 +101,6 @@ private: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/chartspaceconverter.hxx b/oox/inc/drawingml/chart/chartspaceconverter.hxx index 62b77a610bd4..7e919c292941 100644 --- a/oox/inc/drawingml/chart/chartspaceconverter.hxx +++ b/oox/inc/drawingml/chart/chartspaceconverter.hxx @@ -31,7 +31,6 @@ namespace drawingml { namespace chart { - struct ChartSpaceModel; class ChartSpaceConverter : public ConverterBase< ChartSpaceModel > @@ -47,7 +46,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/chartspacefragment.hxx b/oox/inc/drawingml/chart/chartspacefragment.hxx index 59abb1b14cc6..8a3c66068cf8 100644 --- a/oox/inc/drawingml/chart/chartspacefragment.hxx +++ b/oox/inc/drawingml/chart/chartspacefragment.hxx @@ -27,7 +27,6 @@ namespace drawingml { namespace chart { - struct ChartSpaceModel; /** Handler for a chart fragment (c:chartSpace root element). @@ -45,7 +44,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/chartspacemodel.hxx b/oox/inc/drawingml/chart/chartspacemodel.hxx index 4a98bbf487fc..f559d5339fff 100644 --- a/oox/inc/drawingml/chart/chartspacemodel.hxx +++ b/oox/inc/drawingml/chart/chartspacemodel.hxx @@ -29,7 +29,6 @@ namespace drawingml { namespace chart { - struct ChartSpaceModel { typedef ModelRef< Shape > ShapeRef; @@ -63,7 +62,6 @@ struct ChartSpaceModel }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx index 9393a302e05b..4e6a797eba1e 100644 --- a/oox/inc/drawingml/chart/converterbase.hxx +++ b/oox/inc/drawingml/chart/converterbase.hxx @@ -45,7 +45,6 @@ struct ChartSpaceModel; struct ConverterData; - const sal_Int32 API_PRIM_AXESSET = 0; const sal_Int32 API_SECN_AXESSET = 1; @@ -54,7 +53,6 @@ const sal_Int32 API_Y_AXIS = 1; const sal_Int32 API_Z_AXIS = 2; - class ConverterRoot { public: @@ -99,7 +97,6 @@ private: }; - /** Base class of all converter classes. Holds a reference to a model structure of the specified type. */ @@ -119,7 +116,6 @@ protected: }; - /** A layout converter calculates positions and sizes for various chart objects. */ class LayoutConverter : public ConverterBase< LayoutModel > @@ -145,7 +141,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/datasourcecontext.hxx b/oox/inc/drawingml/chart/datasourcecontext.hxx index 15778a12fce6..07c98263a793 100644 --- a/oox/inc/drawingml/chart/datasourcecontext.hxx +++ b/oox/inc/drawingml/chart/datasourcecontext.hxx @@ -28,13 +28,11 @@ namespace drawingml { namespace chart { - struct DataSequenceModel; typedef ContextBase< DataSequenceModel > DataSequenceContextBase; - /** Handler for a double sequence context (c:numLit, c:numRef elements). */ class DoubleSequenceContext : public DataSequenceContextBase @@ -55,7 +53,6 @@ private: }; - /** Handler for a string sequence context (c:multiLvlStrRef, c:strLit, c:strRef elements). */ @@ -73,7 +70,6 @@ private: }; - struct DataSourceModel; /** Handler for a data source context (c:bubbleSize, c:cat, c:minus, c:plus, @@ -89,7 +85,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/datasourceconverter.hxx b/oox/inc/drawingml/chart/datasourceconverter.hxx index 77fa3f9edccf..7ce02d838ffa 100644 --- a/oox/inc/drawingml/chart/datasourceconverter.hxx +++ b/oox/inc/drawingml/chart/datasourceconverter.hxx @@ -31,7 +31,6 @@ namespace drawingml { namespace chart { - struct DataSequenceModel; class DataSequenceConverter : public ConverterBase< DataSequenceModel > @@ -46,7 +45,6 @@ public: }; - struct DataSourceModel; class DataSourceConverter : public ConverterBase< DataSourceModel > @@ -61,7 +59,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/plotareacontext.hxx b/oox/inc/drawingml/chart/plotareacontext.hxx index 8a22dbedf28f..161b0d244cf3 100644 --- a/oox/inc/drawingml/chart/plotareacontext.hxx +++ b/oox/inc/drawingml/chart/plotareacontext.hxx @@ -27,7 +27,6 @@ namespace drawingml { namespace chart { - struct View3DModel; /** Handler for a chart plot area context (c:plotArea element). @@ -42,7 +41,6 @@ public: }; - struct WallFloorModel; /** Handler for a chart wall/floor context (c:backWall, c:floor, c:sideWall @@ -58,7 +56,6 @@ public: }; - struct DataTableModel; /** Handler for a data table context (c:dTable element). @@ -73,7 +70,6 @@ public: }; - struct PlotAreaModel; /** Handler for a chart plot area context (c:plotArea element). @@ -88,7 +84,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx index ed8c1c59092b..143d08a1649a 100644 --- a/oox/inc/drawingml/chart/plotareaconverter.hxx +++ b/oox/inc/drawingml/chart/plotareaconverter.hxx @@ -31,7 +31,6 @@ namespace drawingml { namespace chart { - struct View3DModel; class TypeGroupConverter; @@ -48,7 +47,6 @@ public: }; - struct WallFloorModel; class WallFloorConverter : public ConverterBase< WallFloorModel > @@ -64,7 +62,6 @@ public: }; - struct DataTableModel; class DataTableConverter : public ConverterBase< DataTableModel > @@ -79,7 +76,6 @@ public: }; - struct PlotAreaModel; class PlotAreaConverter : public ConverterBase< PlotAreaModel > @@ -106,7 +102,6 @@ private: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/seriescontext.hxx b/oox/inc/drawingml/chart/seriescontext.hxx index c366d526a5e6..c0e6f979e342 100644 --- a/oox/inc/drawingml/chart/seriescontext.hxx +++ b/oox/inc/drawingml/chart/seriescontext.hxx @@ -27,7 +27,6 @@ namespace drawingml { namespace chart { - struct DataLabelModel; /** Handler for a chart data point label context (c:dLbl element). @@ -43,7 +42,6 @@ public: }; - struct DataLabelsModel; /** Handler for a chart data point label context (c:dLbls element). @@ -59,7 +57,6 @@ public: }; - struct PictureOptionsModel; /** Handler for fill bitmap settings (c:pictureOptions element). @@ -74,7 +71,6 @@ public: }; - struct ErrorBarModel; /** Handler for a series error bar context (c:errBars element). @@ -89,7 +85,6 @@ public: }; - struct TrendlineLabelModel; /** Handler for a series trendline label context (c:trendlineLbl element). @@ -104,7 +99,6 @@ public: }; - struct TrendlineModel; /** Handler for a series trendline context (c:trendline element). @@ -120,7 +114,6 @@ public: }; - struct DataPointModel; /** Handler for a chart data point context (c:dPt element). @@ -135,7 +128,6 @@ public: }; - struct SeriesModel; /** Handler base class for chart data series contexts (c:ser element). @@ -150,7 +142,6 @@ public: }; - /** Handler for a data series context for area chart types (c:ser element). */ class AreaSeriesContext : public SeriesContextBase @@ -163,7 +154,6 @@ public: }; - /** Handler for a data series context for bar chart types (c:ser element). */ class BarSeriesContext : public SeriesContextBase @@ -176,7 +166,6 @@ public: }; - /** Handler for a data series context for bubble chart types (c:ser element). */ class BubbleSeriesContext : public SeriesContextBase @@ -189,7 +178,6 @@ public: }; - /** Handler for a data series context for line and stock chart types (c:ser element). */ @@ -203,7 +191,6 @@ public: }; - /** Handler for a data series context for pie and doughnut chart types (c:ser element). */ @@ -217,7 +204,6 @@ public: }; - /** Handler for a data series context for radar chart types (c:ser element). */ class RadarSeriesContext : public SeriesContextBase @@ -230,7 +216,6 @@ public: }; - /** Handler for a data series context for scatter chart types (c:ser element). */ class ScatterSeriesContext : public SeriesContextBase @@ -243,7 +228,6 @@ public: }; - /** Handler for a data series context for scatter chart types (c:ser element). */ class SurfaceSeriesContext : public SeriesContextBase @@ -256,7 +240,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/seriesconverter.hxx b/oox/inc/drawingml/chart/seriesconverter.hxx index 82b63060dd39..a502137b712f 100644 --- a/oox/inc/drawingml/chart/seriesconverter.hxx +++ b/oox/inc/drawingml/chart/seriesconverter.hxx @@ -38,7 +38,6 @@ class TypeGroupConverter; #define OOX_CHART_SMOOTHED_PER_SERIES 0 - class DataLabelConverter : public ConverterBase< DataLabelModel > { public: @@ -52,7 +51,6 @@ public: }; - class DataLabelsConverter : public ConverterBase< DataLabelsModel > { public: @@ -66,7 +64,6 @@ public: }; - class ErrorBarConverter : public ConverterBase< ErrorBarModel > { public: @@ -83,7 +80,6 @@ private: }; - class TrendlineLabelConverter : public ConverterBase< TrendlineLabelModel > { public: @@ -95,7 +91,6 @@ public: }; - class TrendlineConverter : public ConverterBase< TrendlineModel > { public: @@ -108,7 +103,6 @@ public: }; - class DataPointConverter : public ConverterBase< DataPointModel > { public: @@ -123,7 +117,6 @@ public: }; - class SeriesConverter : public ConverterBase< SeriesModel > { public: @@ -149,7 +142,6 @@ private: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/titlecontext.hxx b/oox/inc/drawingml/chart/titlecontext.hxx index 128d43274e64..eeb8184513e9 100644 --- a/oox/inc/drawingml/chart/titlecontext.hxx +++ b/oox/inc/drawingml/chart/titlecontext.hxx @@ -27,7 +27,6 @@ namespace drawingml { namespace chart { - struct TextModel; /** Handler for a chart text context (c:tx element). @@ -43,7 +42,6 @@ public: }; - struct TitleModel; /** Handler for a chart title context (c:title element). @@ -58,7 +56,6 @@ public: }; - struct LegendModel; /** Handler for a chart legend context (c:legend element). @@ -73,7 +70,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/titleconverter.hxx b/oox/inc/drawingml/chart/titleconverter.hxx index b2140b44e372..ccbc7f308422 100644 --- a/oox/inc/drawingml/chart/titleconverter.hxx +++ b/oox/inc/drawingml/chart/titleconverter.hxx @@ -36,7 +36,6 @@ namespace drawingml { namespace chart { - struct TextModel; class TextConverter : public ConverterBase< TextModel > @@ -64,7 +63,6 @@ private: }; - struct TitleModel; class TitleConverter : public ConverterBase< TitleModel > @@ -81,7 +79,6 @@ public: }; - struct LegendModel; class LegendConverter : public ConverterBase< LegendModel > @@ -96,7 +93,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/typegroupcontext.hxx b/oox/inc/drawingml/chart/typegroupcontext.hxx index a4af55cda6a6..54260362991b 100644 --- a/oox/inc/drawingml/chart/typegroupcontext.hxx +++ b/oox/inc/drawingml/chart/typegroupcontext.hxx @@ -27,7 +27,6 @@ namespace drawingml { namespace chart { - struct UpDownBarsModel; /** Handler for an up/down bars context (c:upDownBars element). @@ -42,12 +41,10 @@ public: }; - struct TypeGroupModel; typedef ContextBase< TypeGroupModel > TypeGroupContextBase; - /** Handler for area type group contexts (c:area3DChart, c:areaChart elements). */ class AreaTypeGroupContext : public TypeGroupContextBase @@ -60,7 +57,6 @@ public: }; - /** Handler for bar type group contexts (c:bar3DChart, c:barChart elements). */ class BarTypeGroupContext : public TypeGroupContextBase @@ -73,7 +69,6 @@ public: }; - /** Handler for bubble type group context (c:bubbleChart element). */ class BubbleTypeGroupContext : public TypeGroupContextBase @@ -86,7 +81,6 @@ public: }; - /** Handler for line type group contexts (c:line3DChart, c:lineChart, c:stockChart elements). */ @@ -100,7 +94,6 @@ public: }; - /** Handler for pie type group contexts (c:doughnutChart, c:ofPieChart, c:pie3DChart, c:pieChart elements). */ @@ -114,7 +107,6 @@ public: }; - /** Handler for radar type group context (c:radarChart element). */ class RadarTypeGroupContext : public TypeGroupContextBase @@ -127,7 +119,6 @@ public: }; - /** Handler for scatter type group context (c:scatterChart element). */ class ScatterTypeGroupContext : public TypeGroupContextBase @@ -140,7 +131,6 @@ public: }; - /** Handler for surface type group contexts (c:surface3DChart, c:surfaceChart elements). */ @@ -154,7 +144,6 @@ public: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/colorchoicecontext.hxx b/oox/inc/drawingml/colorchoicecontext.hxx index 62c8b44880bc..86d8ae7dade7 100644 --- a/oox/inc/drawingml/colorchoicecontext.hxx +++ b/oox/inc/drawingml/colorchoicecontext.hxx @@ -28,7 +28,6 @@ namespace drawingml { class Color; - /** Context handler for the different color value elements (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ class ColorValueContext : public ::oox::core::ContextHandler2 @@ -50,7 +49,6 @@ private: }; - /** Context handler for elements that *contain* a color value element (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ class ColorContext : public ::oox::core::ContextHandler2 @@ -68,7 +66,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/customshapegeometry.hxx b/oox/inc/drawingml/customshapegeometry.hxx index 7e3dcec8edf0..6108d1483ff9 100644 --- a/oox/inc/drawingml/customshapegeometry.hxx +++ b/oox/inc/drawingml/customshapegeometry.hxx @@ -28,7 +28,6 @@ namespace oox { namespace drawingml { - // CT_CustomGeometry2D class CustomShapeGeometryContext : public ::oox::core::ContextHandler2 { diff --git a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx index f5210c7ed1ea..59cf7d27fa7d 100644 --- a/oox/inc/drawingml/fillpropertiesgroupcontext.hxx +++ b/oox/inc/drawingml/fillpropertiesgroupcontext.hxx @@ -27,7 +27,6 @@ namespace oox { namespace drawingml { - /** Context handler that imports the a:solidFill element. */ class SolidFillContext : public ColorContext { @@ -39,7 +38,6 @@ public: }; - /** Context handler that imports the a:gradFill element. */ class GradientFillContext : public ::oox::core::ContextHandler2 { @@ -77,7 +75,6 @@ private: }; - /** Context handler that imports a14:imgProps, a14:imgLayer, a14:imgEffect containers and the a14:artistic* effect tags defined in the MS-ODRAWXML extension. */ class ArtisticEffectContext : public ::oox::core::ContextHandler2 @@ -98,7 +95,6 @@ private: }; - /** Context handler that imports the a:extLst element inside a:blip and its children a:ext, which can contain transformations to the bitmap. */ class BlipExtensionContext : public ::oox::core::ContextHandler2 @@ -119,7 +115,6 @@ private: }; - /** Context handler that imports the a:duotone element containing the colors of a bitmap duotone transformation. */ class DuotoneContext : public ::oox::core::ContextHandler2 @@ -142,7 +137,6 @@ private: }; - /** Context handler that imports the a:clrChange element containing the colors of a bitmap color change transformation. */ class ColorChangeContext : public ::oox::core::ContextHandler2 diff --git a/oox/inc/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx index a176ae612dfb..c1d03cd9fc61 100644 --- a/oox/inc/drawingml/linepropertiescontext.hxx +++ b/oox/inc/drawingml/linepropertiescontext.hxx @@ -25,7 +25,6 @@ namespace oox { namespace drawingml { - struct LineProperties; class LinePropertiesContext : public ::oox::core::ContextHandler2 diff --git a/oox/inc/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx index 8896c115573d..8c195090cdc8 100644 --- a/oox/inc/drawingml/shape3dproperties.hxx +++ b/oox/inc/drawingml/shape3dproperties.hxx @@ -35,7 +35,6 @@ namespace oox { namespace drawingml { - struct RotationProperties { OptValue< sal_Int32 > mnLatitude; @@ -86,7 +85,6 @@ struct Shape3DProperties }; - } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/textbodyproperties.hxx b/oox/inc/drawingml/textbodyproperties.hxx index 7810af946ffc..bcb75546a688 100644 --- a/oox/inc/drawingml/textbodyproperties.hxx +++ b/oox/inc/drawingml/textbodyproperties.hxx @@ -29,7 +29,6 @@ namespace oox { namespace drawingml { - struct TextBodyProperties { PropertyMap maPropertyMap; @@ -50,7 +49,6 @@ struct TextBodyProperties }; - } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/textcharacterproperties.hxx b/oox/inc/drawingml/textcharacterproperties.hxx index b873c8838f85..1720bee0bc69 100644 --- a/oox/inc/drawingml/textcharacterproperties.hxx +++ b/oox/inc/drawingml/textcharacterproperties.hxx @@ -32,7 +32,6 @@ namespace oox { namespace drawingml { - struct TextCharacterProperties { PropertyMap maHyperlinkPropertyMap; @@ -83,7 +82,6 @@ struct TextCharacterProperties }; - } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/textfont.hxx b/oox/inc/drawingml/textfont.hxx index bb6ae6d2af82..0b5c7b1aa08d 100644 --- a/oox/inc/drawingml/textfont.hxx +++ b/oox/inc/drawingml/textfont.hxx @@ -29,7 +29,6 @@ namespace oox { namespace drawingml { - /** carries a CT_TextFont*/ class TextFont { @@ -67,7 +66,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 9ac9c69d849c..a23314350c1f 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1917,7 +1917,6 @@ void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph ) FSEND ); - if( bHasLinespacing ) { mpFS->startElementNS( XML_a, XML_lnSpc, FSEND ); @@ -2237,7 +2236,6 @@ void DrawingML::WriteCustomGeometry( Reference< XShape > rXShape ) } - uno::Sequence< beans::PropertyValue > const * pGeometrySeq = static_cast<uno::Sequence< beans::PropertyValue > const *>(aAny.getValue()); diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index a913c7a15b3d..1129901d9fa8 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -68,7 +68,6 @@ void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer ) } - sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) { if (nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()) diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index eba4f4458efc..8b44c6445eaf 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -90,7 +90,6 @@ void PyUNO_del (PyObject* self) } - OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef , sal_Int32 mode ) { assert( pVal ); diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx index 86528f1817f7..886917d94379 100644 --- a/pyuno/source/module/pyuno_util.cxx +++ b/pyuno/source/module/pyuno_util.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/beans/XMaterialHolder.hpp> - using com::sun::star::uno::TypeDescription; using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; @@ -114,7 +113,6 @@ PyRef getObjectFromUnoModule( const Runtime &runtime, const char * func ) } - // Logging diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index a2908e12cf7d..9fa3dab7d1c8 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -69,7 +69,6 @@ RegError ORegKey::createKey(const OUString& keyName, RegKeyHandle* phNewKey) } - // openKey RegError ORegKey::openKey(const OUString& keyName, RegKeyHandle* phOpenKey) @@ -78,7 +77,6 @@ RegError ORegKey::openKey(const OUString& keyName, RegKeyHandle* phOpenKey) } - // openSubKeys RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubKeys, sal_uInt32* pnSubKeys) @@ -140,7 +138,6 @@ RegError ORegKey::openSubKeys(const OUString& keyName, RegKeyHandle** phOpenSubK } - // getKeyNames RegError ORegKey::getKeyNames(const OUString& keyName, @@ -200,7 +197,6 @@ RegError ORegKey::getKeyNames(const OUString& keyName, } - // closeKey RegError ORegKey::closeKey(RegKeyHandle hKey) @@ -209,7 +205,6 @@ RegError ORegKey::closeKey(RegKeyHandle hKey) } - // deleteKey RegError ORegKey::deleteKey(const OUString& keyName) @@ -218,7 +213,6 @@ RegError ORegKey::deleteKey(const OUString& keyName) } - // getValueType RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueType, sal_uInt32* pValueSize) const @@ -285,7 +279,6 @@ RegError ORegKey::getValueInfo(const OUString& valueName, RegValueType* pValueTy } - // setValue RegError ORegKey::setValue(const OUString& valueName, RegValueType vType, RegValue value, sal_uInt32 vSize) diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx index 468bd549f533..9bb560a47325 100644 --- a/registry/source/reflcnst.hxx +++ b/registry/source/reflcnst.hxx @@ -227,7 +227,4 @@ sal_uInt32 UINT16StringLen(const sal_uInt8* wstring); #endif - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index b7ab081d7b25..eaa1d18ab3fc 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -34,7 +34,6 @@ #include "reflcnst.hxx" - namespace { inline OString toByteString(rtl_uString const * str) { diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 6e262b2eb22f..74c5a0311a6e 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -449,7 +449,6 @@ ORegistry::~ORegistry() } - // initRegistry RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMode, bool bCreate) @@ -516,7 +515,6 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo } - // closeRegistry RegError ORegistry::closeRegistry() @@ -536,7 +534,6 @@ RegError ORegistry::closeRegistry() } - // destroyRegistry RegError ORegistry::destroyRegistry(const OUString& regName) @@ -692,7 +689,6 @@ RegError ORegistry::createKey(RegKeyHandle hKey, const OUString& keyName, } - // openKey RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, @@ -741,7 +737,6 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, } - // closeKey RegError ORegistry::closeKey(RegKeyHandle hKey) @@ -898,7 +893,6 @@ RegError ORegistry::deleteSubkeysAndValues(ORegKey* pKey) } - // loadKey RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName, @@ -1121,7 +1115,6 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, } - // checkblop() RegError ORegistry::checkBlop(OStoreStream& rValue, @@ -1396,7 +1389,6 @@ RegError ORegistry::loadAndSaveKeys(ORegKey* pTargetKey, } - // getRootKey() ORegKey* ORegistry::getRootKey() @@ -1406,7 +1398,6 @@ ORegKey* ORegistry::getRootKey() } - // dumpRegistry() RegError ORegistry::dumpRegistry(RegKeyHandle hKey) const diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index fed98584c645..0b355fa98c7f 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -51,7 +51,6 @@ static void REGISTRY_CALLTYPE acquire(RegHandle hReg) } - // release static void REGISTRY_CALLTYPE release(RegHandle hReg) @@ -69,7 +68,6 @@ static void REGISTRY_CALLTYPE release(RegHandle hReg) } - // getName static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName) @@ -93,7 +91,6 @@ static RegError REGISTRY_CALLTYPE getName(RegHandle hReg, rtl_uString** pName) } - // isReadOnly static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg) @@ -105,7 +102,6 @@ static sal_Bool REGISTRY_CALLTYPE isReadOnly(RegHandle hReg) } - // createRegistry static RegError REGISTRY_CALLTYPE createRegistry(rtl_uString* registryName, @@ -151,7 +147,6 @@ static RegError REGISTRY_CALLTYPE openRootKey(RegHandle hReg, } - // openRegistry static RegError REGISTRY_CALLTYPE openRegistry(rtl_uString* registryName, @@ -204,7 +199,6 @@ static RegError REGISTRY_CALLTYPE closeRegistry(RegHandle hReg) } - // destroyRegistry static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg, @@ -235,7 +229,6 @@ static RegError REGISTRY_CALLTYPE destroyRegistry(RegHandle hReg, } - // mergeKey static RegError REGISTRY_CALLTYPE mergeKey(RegHandle hReg, @@ -361,7 +354,6 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry, } - // reg_openRegistry RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName, @@ -400,7 +392,6 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry) } - // reg_dumpRegistry RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey) diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index 7e471f0b9f43..4da68754f117 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -27,7 +27,6 @@ #include "keyimpl.hxx" - // acquireKey void REGISTRY_CALLTYPE acquireKey(RegKeyHandle hKey) @@ -41,7 +40,6 @@ void REGISTRY_CALLTYPE acquireKey(RegKeyHandle hKey) } - // releaseKey void REGISTRY_CALLTYPE releaseKey(RegKeyHandle hKey) @@ -55,7 +53,6 @@ void REGISTRY_CALLTYPE releaseKey(RegKeyHandle hKey) } - // isKeyReadOnly sal_Bool REGISTRY_CALLTYPE isKeyReadOnly(RegKeyHandle hKey) @@ -65,7 +62,6 @@ sal_Bool REGISTRY_CALLTYPE isKeyReadOnly(RegKeyHandle hKey) } - // getKeyName RegError REGISTRY_CALLTYPE getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName) @@ -83,7 +79,6 @@ RegError REGISTRY_CALLTYPE getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName) } - // createKey RegError REGISTRY_CALLTYPE createKey(RegKeyHandle hKey, @@ -671,7 +666,6 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames, // C API - // reg_openKey RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey, @@ -696,5 +690,4 @@ RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx index 48eb384473b6..cd480534abc5 100644 --- a/registry/test/testmerge.cxx +++ b/registry/test/testmerge.cxx @@ -187,7 +187,6 @@ void test_merge() OUString("merge2.rdb")), "testMerge error 4"); - REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1), "testMerge error 5"); REG_ENSURE(!key1.openKey("MergeKey1", mkey1), "testMerge error 6"); @@ -216,7 +215,6 @@ void test_merge() REG_ENSURE(!key1.closeKey(), "testMerge error 24"); - REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key2), "testMerge error 25"); REG_ENSURE(!key2.openKey("MergeKey2", mkey2), "testMerge error 26"); @@ -245,7 +243,6 @@ void test_merge() REG_ENSURE(!key2.closeKey(), "testMerge error 44"); - REG_ENSURE(!rootKey.openKey("/stardiv/IchbineinMergeKey", key1u2), "testMerge error 40"); REG_ENSURE(!key1u2.openKey("MergeKey1u2", mkey1u2), "testMerge error 41"); @@ -289,7 +286,6 @@ void test_merge() REG_ENSURE(!key1u2.closeKey(), "testMerge error 71"); - RegValueType valueType; sal_uInt32 valueSize; sal_Int32 int32Value; @@ -396,7 +392,6 @@ void test_merge() REG_ENSURE(!key1.closeKey(), "testMerge error 24"); - REG_ENSURE(!rootKey.closeKey(), "testMerge error 10"); REG_ENSURE(!myRegistry->destroy( OUString("merge1.rdb") ), "test_registry_CppApi error 11"); diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index b689b37bea13..767d4fc6e028 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::frame; - namespace remotebridges_officeclient { class OfficeClientMain : public WeakImplHelper1< XMain > diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index 722a7aed55c7..caf0d530331e 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -28,7 +28,6 @@ #include "RptDef.hxx" - namespace rptui { diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx index fdff014666a1..c67ad1a4bc28 100644 --- a/reportdesign/inc/ReportHelperDefines.hxx +++ b/reportdesign/inc/ReportHelperDefines.hxx @@ -182,7 +182,6 @@ virtual void SAL_CALL setCharLocaleComplex( const css::lang::Locale& _charlocalecomplex ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - #endif // INCLUDED_REPORTDESIGN_INC_REPORTHELPERDEFINES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 4e581f2dac0c..320506cafb2b 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -30,7 +30,6 @@ namespace rptui { - // = ConditionalExpression class REPORTDESIGN_DLLPUBLIC ConditionalExpression diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 506ec8f0d7c7..8552778e72d9 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -31,7 +31,6 @@ namespace rptui { - //= ReportFormula class REPORTDESIGN_DLLPUBLIC ReportFormula diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 8c2b7fc306ca..3adbba16ddda 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -566,7 +566,6 @@ void SAL_CALL OFixedLine::setPrintRepeatedValues( sal_Bool /*_printrepeatedvalue } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index bbd1da439322..a58030bb346c 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -180,7 +180,6 @@ void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ ) throw ( } - sal_Bool SAL_CALL OFixedText::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -323,7 +322,6 @@ OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException, std } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index eefc18b4a774..04e078d6a747 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -212,7 +212,6 @@ void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _c } - // XCloneable uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 43bc4b7a1aae..347dd4e420a7 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -202,7 +202,6 @@ void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Par } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 92bd06598397..faf823eabafa 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -334,7 +334,6 @@ void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _con } - // XCloneable uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 2d474f168049..f66e5e97d52f 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -135,5 +135,4 @@ OReportComponentProperties::~OReportComponentProperties() } // namespace reportdesign - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 0ff1778939fe..5b37df61d77e 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -505,8 +505,6 @@ void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::Proper } - - }// namespace reportdesign diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 94ee95709733..e4350305d84c 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -62,7 +62,6 @@ uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XRe } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 7f499f2ff12d..0b1260b60f0e 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - // registry functions namespace { diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index e1e6e82f16f9..7e6e0dc50ddf 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -32,7 +32,6 @@ namespace rptui { - //= ConditionUpdater class ConditionUpdater : public ::boost::noncopyable diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 797441b6945c..9de5227d1c8b 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -45,7 +45,6 @@ using namespace reportdesign; using namespace com::sun::star; - OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition) : SdrModel(SvtPathOptions().GetPalettePath(),nullptr,_pReportDefinition, false, false) ,m_pController(nullptr) @@ -79,7 +78,6 @@ SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/) } - void OReportModel::SetChanged( bool bChanged ) { SdrModel::SetChanged( bChanged ); @@ -87,8 +85,6 @@ void OReportModel::SetChanged( bool bChanged ) } - - void OReportModel::SetModified(bool _bModified) { if ( m_pController ) diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index c7fd48ffec2b..00c6d9898c28 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -576,8 +576,6 @@ void OCustomShape::impl_setUnoShape( const uno::Reference< uno::XInterface >& rx } - - OUnoObject::OUnoObject(const OUString& _sComponentName ,const OUString& rModelName ,sal_uInt16 _nObjectType) @@ -705,7 +703,6 @@ void OUnoObject::NbcMove( const Size& rSize ) } - void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract) { SdrUnoObj::NbcResize( rRef, xFract, yFract ); @@ -991,7 +988,6 @@ void OOle2Obj::NbcMove( const Size& rSize ) } - void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract) { SdrOle2Obj::NbcResize( rRef, xFract, yFract ); diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index efee1a77273c..563a9fcf5d98 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -26,14 +26,12 @@ namespace rptui // OObjectListener - OObjectListener::OObjectListener(OObjectBase* _pObject) :m_pObject(_pObject) { } - OObjectListener::~OObjectListener() { } @@ -54,8 +52,6 @@ void SAL_CALL OObjectListener::propertyChange( const css::beans::PropertyChange } - - // DlgEdHint diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index c374cb30aef3..9cf104983180 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -40,7 +40,6 @@ OReportPage::OReportPage( OReportModel& _rModel } - OReportPage::OReportPage( const OReportPage& rPage ) :SdrPage( rPage ) ,rModel(rPage.rModel) @@ -51,13 +50,11 @@ OReportPage::OReportPage( const OReportPage& rPage ) } - OReportPage::~OReportPage() { } - SdrPage* OReportPage::Clone() const { return Clone(nullptr); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 90bfc195c1c2..c029bae1a6f4 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -82,7 +82,6 @@ namespace rptui } - OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID) :SdrUndoAction(_rMod) { diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index b24dcb3739a5..c2ad558b7f27 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -61,7 +61,6 @@ namespace rptui using namespace report; - struct PropertyInfo { bool bIsReadonlyOrTransient; @@ -89,7 +88,6 @@ struct ObjectInfo typedef ::std::map< Reference< XPropertySet >, ObjectInfo, ::comphelper::OInterfaceCompare< XPropertySet > > PropertySetInfoCache; - class OXUndoEnvironmentImpl: private boost::noncopyable { public: @@ -117,7 +115,6 @@ OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_ } - OXUndoEnvironment::OXUndoEnvironment(OReportModel& _rModel) :m_pImpl(new OXUndoEnvironmentImpl(_rModel) ) { @@ -542,7 +539,6 @@ void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & } - void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "OXUndoEnvironment::switchListening: invalid container!" ); diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index 500ca9715530..837db62b36f8 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -80,7 +80,6 @@ OXMLAutoStylePoolP::~OXMLAutoStylePoolP() } - } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 2b77fe1413be..64b358eff91f 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -156,7 +156,6 @@ namespace rptxml } - class OSpecialHandleXMLExportPropertyMapper : public SvXMLExportPropertyMapper { public: diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 82df4ab0660c..4f89a2acf3a1 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -106,7 +106,6 @@ void OXMLCharContent::InsertString(const OUString& _sString) } - OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName ,OXMLCell& _rCell diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 20350762c4cc..9b8d6e988cde 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -31,7 +31,6 @@ #define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) - class SvXMLStylesContext; class SvXMLTokenMap; namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 9564825c606d..7133cd9f6a6b 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -39,7 +39,6 @@ namespace rptxml using namespace ::com::sun::star::xml::sax; - OXMLImage::OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList @@ -112,7 +111,6 @@ OXMLImage::~OXMLImage() } - } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 36d8fdf3658b..abd6fbbf03b6 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -109,7 +109,6 @@ OXMLReport::~OXMLReport() } - void OXMLReport::impl_initRuntimeDefaults() const { OSL_PRECOND( m_xComponent.is(), "OXMLReport::impl_initRuntimeDefaults: no component!" ); @@ -127,7 +126,6 @@ void OXMLReport::impl_initRuntimeDefaults() const } - SvXMLImportContext* OXMLReport::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 0119d239f1d0..9c8e41df34a0 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -50,7 +50,6 @@ namespace rptxml } - OXMLSection::OXMLSection( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& _sLocalName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 2edc59fb7cc8..2888c8b36cb3 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star::container; using namespace xmloff::token; - class OSpecialHanldeXMLImportPropertyMapper : public SvXMLImportPropertyMapper { public: @@ -146,7 +145,6 @@ void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey, } - OReportStylesContext::OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx , const OUString& rLName , diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 27cd7b8ba921..998428070dc9 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -374,7 +374,6 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext, S } - ORptFilter::~ORptFilter() throw() { } diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index 97521de09513..5efcd69f9c8a 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -87,7 +87,6 @@ namespace rptui void operator =(ReportComponentHandler &) = delete; - // override WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, // if your component needs special work when it becomes diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 29b50ab86882..385e1d898982 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -44,7 +44,6 @@ namespace rptui class OSectionView; - struct RectangleLess : public ::std::binary_function< Rectangle, Rectangle, bool> { enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL }; diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 9f43de7cc73d..3f980ab74e85 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -144,7 +144,6 @@ namespace rptui #define PROPERTY_ID_VERTICALALIGN 42 - } // namespace rptui diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index e8cf8cf221e4..6cff81182202 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -201,7 +201,6 @@ namespace rptui } - const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { // intialisierung @@ -303,7 +302,6 @@ namespace rptui } - } // namespace pcr diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 70a7b4328e73..dd08cb65273e 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -394,5 +394,4 @@ void OGroupUndo::Redo() } // rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 2715df93b3b9..e7e8440cc51d 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - // registry functions namespace { diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 6589bf28e5ec..95eaccae5092 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -277,5 +277,4 @@ throw (uno::RuntimeException, std::exception) } // rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index b15399dcf340..eb2cdb072f2e 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -303,8 +303,6 @@ OUString ODesignView::GetInsertObjString() const } - - void ODesignView::Cut() { Copy(); @@ -312,14 +310,12 @@ void ODesignView::Cut() } - void ODesignView::Copy() { m_aScrollWindow->Copy(); } - void ODesignView::Paste() { m_aScrollWindow->Paste(); diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index b0ef99ae216a..21fbaa477435 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -150,7 +150,6 @@ namespace rptui } - // XPropertyChangeListener uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException) { @@ -196,8 +195,6 @@ namespace rptui } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index ab8d82491255..649d7fc6a39d 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -47,7 +47,6 @@ namespace rptui using namespace ::com::sun::star; - FormattedFieldBeautifier::FormattedFieldBeautifier(const OReportController& _aController) :m_rReportController(_aController) ,m_nTextColor(-1) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 3f61c9baa961..d432799acfbc 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -4215,7 +4215,6 @@ OSectionWindow* OReportController::getSectionWindow(const css::uno::Reference< c } - void OReportController::openZoomDialog() { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 6916809e8230..c9596b290708 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -60,7 +60,6 @@ public: }; - OXReportControllerObserverImpl::OXReportControllerObserverImpl() :m_nLocks(0) ,m_bReadOnly(false) @@ -68,10 +67,6 @@ public: } - - - - OXReportControllerObserver::OXReportControllerObserver(const OReportController& _rController) :m_pImpl(new OXReportControllerObserverImpl ) ,m_aFormattedFieldBeautifier(_rController) @@ -246,7 +241,6 @@ void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< u } - void OXReportControllerObserver::switchListening( const uno::Reference< container::XIndexAccess >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "OXReportControllerObserver::switchListening: invalid container!" ); @@ -408,5 +402,4 @@ void SAL_CALL OXReportControllerObserver::elementRemoved(const container::Contai } // namespace rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index b08e4e62a2af..d4dd06204910 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -402,7 +402,6 @@ void OReportSection::MouseButtonUp( const MouseEvent& rMEvt ) } - void OReportSection::MouseMove( const MouseEvent& rMEvt ) { m_pFunc->MouseMove( rMEvt ); diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index 810db1386e8b..bb01d282d17e 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -49,13 +49,11 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O } - OSectionView::~OSectionView() { } - void OSectionView::MarkListHasChanged() { SdrView::MarkListHasChanged(); @@ -69,7 +67,6 @@ void OSectionView::MarkListHasChanged() } - void OSectionView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) { // visible area diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index c85872e0b3d9..456db62e589a 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -362,7 +362,6 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) } - void OViewsWindow::SetMode( DlgEdMode eNewMode ) { ::std::for_each(m_aSections.begin(),m_aSections.end(), diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 57d470256c8f..f1c57ca559e2 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -31,21 +31,18 @@ namespace rptui using namespace ::com::sun::star; - DlgEdFactory::DlgEdFactory() { SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } - DlgEdFactory::~DlgEdFactory() { SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } - IMPL_STATIC_LINK_TYPED( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory, void ) { diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index cd743ae9dfa5..a8f7cede94d1 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -60,15 +60,12 @@ namespace rptui using namespace ::com::sun::star; - - IMPL_LINK_NOARG_TYPED( DlgEdFunc, ScrollTimeout, Timer *, void ) { ForceScroll( m_pParent->PixelToLogic( m_pParent->GetPointerPosPixel() ) ); } - void DlgEdFunc::ForceScroll( const Point& rPos ) { aScrollTimer.Stop(); @@ -163,7 +160,6 @@ DlgEdFunc::~DlgEdFunc() } - bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) { m_aMDPos = m_pParent->PixelToLogic( rMEvt.GetPosPixel() ); @@ -223,7 +219,6 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) } - bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ ) { bool bHandled = false; @@ -653,14 +648,12 @@ DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) : } - DlgEdFuncInsert::~DlgEdFuncInsert() { m_rView.SetEditMode(); } - bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonDown(rMEvt) ) @@ -754,7 +747,6 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) } - bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) @@ -790,20 +782,17 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) } - DlgEdFuncSelect::DlgEdFuncSelect( OReportSection* _pParent ) : DlgEdFunc( _pParent ) { } - DlgEdFuncSelect::~DlgEdFuncSelect() { } - bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { m_bSelectionMode = false; @@ -849,7 +838,6 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) } - bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonUp( rMEvt ) ) @@ -873,7 +861,6 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) } - bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index a11250bbf968..77a6c077939b 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -68,7 +68,6 @@ using namespace container; using namespace ::comphelper; - namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) @@ -87,9 +86,6 @@ namespace // PropBrw - - - PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pParent, ODesignView* _pDesignView) :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE)) ,m_xORB(_xORB) @@ -180,7 +176,6 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare } - PropBrw::~PropBrw() { disposeOnce(); @@ -282,7 +277,6 @@ bool PropBrw::Close() } - uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const SdrMarkList& _rMarkList) { const size_t nMarkCount = _rMarkList.GetMarkCount(); @@ -331,7 +325,6 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> } - OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterface> >& _aObjects ) { OUString aName; diff --git a/salhelper/source/condition.cxx b/salhelper/source/condition.cxx index afcadb7d6a36..6112616ecae5 100644 --- a/salhelper/source/condition.cxx +++ b/salhelper/source/condition.cxx @@ -66,7 +66,6 @@ ConditionModifier::~ConditionModifier() } - /****************************************************************** * * * ConditionWaiter * diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index ee42e583441d..89600bee0221 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -75,7 +75,6 @@ protected: }; - // Timer class @@ -232,8 +231,6 @@ TTimeValue Timer::getRemainingTime() const } - - // Timer manager namespace @@ -463,8 +460,6 @@ void TimerManager::run() } - - // Timer manager cleanup diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx index 76cd10dab85f..25245b2a803a 100644 --- a/sax/inc/xml2utf.hxx +++ b/sax/inc/xml2utf.hxx @@ -71,7 +71,6 @@ private: }; - /*---------------------------------------- * * XMLFile2UTFConverter @@ -92,7 +91,6 @@ public: void setEncoding( const OString &s ) { m_sEncoding = s; } - // @param nMaxToRead The number of chars, that should be read. Note that this is no exact number. There // may be returned less or more bytes than ordered. sal_Int32 readAndConvert( css::uno::Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead ) diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index be80a8005a5a..51c3aabb793b 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -313,7 +313,6 @@ extern "C" } - // LocatorImpl class LocatorImpl : @@ -364,8 +363,6 @@ private: }; - - SaxExpatParser::SaxExpatParser( ) { m_pImpl = new SaxExpatParser_Impl; @@ -722,7 +719,6 @@ void SaxExpatParser_Impl::parse( ) } - // The C-Callbacks @@ -836,7 +832,6 @@ void SaxExpatParser_Impl::callbackNotationDecl( } - bool SaxExpatParser_Impl::callbackExternalEntityRef( XML_Parser parser, const XML_Char *context, SAL_UNUSED_PARAMETER const XML_Char * /*base*/, const XML_Char *systemId, diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index 68b44f6461cb..0c3e96564ab7 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -341,8 +341,6 @@ void XMLFile2UTFConverter::initializeDecoding() } - - // Text2UnicodeConverter @@ -444,9 +442,6 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> & } - - - // Unicode2TextConverter diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 3e2cbc983068..f0bf021e4157 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -1944,7 +1944,6 @@ const // p q r s t u v w x y z - void ThreeByteToFourByte (const sal_Int8* pBuffer, const sal_Int32 nStart, const sal_Int32 nFullLen, OUStringBuffer& sBuffer) { sal_Int32 nLen(nFullLen - nStart); diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx index f07097fd1bfd..c031db370fe0 100644 --- a/sax/test/sax/testwriter.cxx +++ b/sax/test/sax/testwriter.cxx @@ -136,7 +136,6 @@ private: }; - /*---------------------------------------- * * Attributlist implementation @@ -197,7 +196,6 @@ struct AttributeListImpl_impl }; - sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return m_pImpl->vecAttribute.size(); @@ -265,14 +263,12 @@ OUString AttributeListImpl::getValueByName(const OUString& sName) throw (Runtim } - AttributeListImpl::AttributeListImpl() { m_pImpl = new AttributeListImpl_impl; } - AttributeListImpl::~AttributeListImpl() { delete m_pImpl; @@ -293,15 +289,6 @@ void AttributeListImpl::clear() } - - - - - - - - - /** * for external binding * @@ -331,7 +318,6 @@ Sequence<OUString> OSaxWriterTest_getSupportedServiceNames( ) throw () } - void OSaxWriterTest::testInvariant( const OUString& TestName, const Reference < XInterface >& TestObject ) throw ( IllegalArgumentException, RuntimeException) @@ -406,7 +392,6 @@ sal_Int32 OSaxWriterTest::test( } - sal_Bool OSaxWriterTest::testPassed() throw (RuntimeException) { return m_seqErrors.getLength() == 0; @@ -452,7 +437,6 @@ void OSaxWriterTest::writeParagraph( } - void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r ) { OUString testParagraph = OUString( diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx index 3f7d21c85dd0..419ce7ea799b 100644 --- a/sax/test/saxdemo.cxx +++ b/sax/test/saxdemo.cxx @@ -304,7 +304,6 @@ struct AttributeListImpl_impl }; - sal_Int16 AttributeListImpl::getLength() throw (RuntimeException) { return (sal_Int16) m_pImpl->vecAttribute.size(); @@ -368,14 +367,12 @@ OUString AttributeListImpl::getValueByName(const OUString& sName) throw (Runtim } - AttributeListImpl::AttributeListImpl() { m_pImpl = new AttributeListImpl_impl; } - AttributeListImpl::~AttributeListImpl() { delete m_pImpl; @@ -395,7 +392,6 @@ void AttributeListImpl::clear() } - // helper function for writing // ensures that linebreaks are inserted // when writing a long text. @@ -425,7 +421,6 @@ void writeParagraphHelper( } - // helper implementation for SAX-Writer // writes data to a file @@ -474,7 +469,6 @@ void OFileWriter::closeOutput() } - // Needed to switch on solaris threads #ifdef SOLARIS extern "C" void ChangeGlobalInit(); @@ -525,7 +519,6 @@ int main (int argc, char **argv) } - // parser demo // read xml from a file and count elements @@ -566,7 +559,6 @@ int main (int argc, char **argv) } - // The SAX-Writer demo x= xSMgr->createInstance("com.sun.star.xml.sax.Writer"); diff --git a/sc/source/core/data/cellvalues.cxx b/sc/source/core/data/cellvalues.cxx index 049538da5f99..183daf96bb0f 100644 --- a/sc/source/core/data/cellvalues.cxx +++ b/sc/source/core/data/cellvalues.cxx @@ -53,7 +53,6 @@ void CellValues::transferFrom( ScColumn& rCol, SCROW nRow, size_t nLen ) } - void CellValues::copyTo( ScColumn& rCol, SCROW nRow ) const { copyCellsTo(rCol, nRow); diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 42904e108004..bfa1c4d4adf0 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -614,7 +614,6 @@ bool ScColorScaleFormat::NeedsRepaint() const } - condformat::ScFormatEntryType ScColorScaleFormat::GetType() const { return condformat::COLORSCALE; diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index ff72cdc6a80b..b7398a964e24 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -686,7 +686,6 @@ ScFunctionMgr::~ScFunctionMgr() } - const ScFuncDesc* ScFunctionMgr::Get( sal_uInt16 nFIndex ) const { const ScFuncDesc* pDesc; diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 511b2333b140..86485db96b5b 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -111,9 +111,6 @@ inline NameBuffer::NameBuffer( RootData* p, sal_uInt16 nNewBase ) : ExcRoot( p ) } - - - inline void NameBuffer::SetBase( sal_uInt16 nNewBase ) { nBase = nNewBase; diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 5b91bfb2a5ed..f2b8810e23b9 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -365,7 +365,6 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId& rId ) } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 2647b7d46005..e298876e62a4 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -173,5 +173,4 @@ com_sun_star_comp_oox_xls_FormulaParser_get_implementation(css::uno::XComponentC } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index fef6ec8d22fb..8863603aca45 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -343,5 +343,4 @@ void ScGraphicShell::GetChangePictureState(SfxItemSet &rSet) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index b820606c399f..fac50562f445 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -1377,7 +1377,6 @@ double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I } - class AnalysisRscStrArrLoader : public Resource { private: @@ -1561,7 +1560,6 @@ void SortedIndividualInt32List::InsertHolidayList( } - void ScaDoubleList::Append( const uno::Sequence< uno::Sequence< double > >& rValueSeq ) throw( uno::RuntimeException, lang::IllegalArgumentException ) { @@ -1645,7 +1643,6 @@ bool ScaDoubleList::CheckInsert( double ) const throw( uno::RuntimeException, la } - bool ScaDoubleListGT0::CheckInsert( double fValue ) const throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( fValue < 0.0 ) @@ -1654,7 +1651,6 @@ bool ScaDoubleListGT0::CheckInsert( double fValue ) const throw( uno::RuntimeExc } - bool ScaDoubleListGE0::CheckInsert( double fValue ) const throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( fValue < 0.0 ) @@ -1663,7 +1659,6 @@ bool ScaDoubleListGE0::CheckInsert( double fValue ) const throw( uno::RuntimeExc } - Complex::Complex( const OUString& rStr ) throw( uno::RuntimeException, lang::IllegalArgumentException ) { if( !ParseString( rStr, *this ) ) @@ -2605,7 +2600,6 @@ double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUStr } - ScaDate::ScaDate() : nOrigDay( 1 ), nDay( 1 ), @@ -2802,7 +2796,6 @@ bool ScaDate::operator<( const ScaDate& rCmp ) const } - ScaAnyConverter::ScaAnyConverter( const uno::Reference< uno::XComponentContext >& xContext ) : nDefaultFormat(0) , bHasValidFormat(false) diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 5f377c8ead5b..ade23104c6d9 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -143,8 +143,6 @@ double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int sal_Int32 nBase ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException ); - - enum FDCategory { FDCat_AddIn, @@ -239,7 +237,6 @@ public: }; - /// sorted list with unique sal_Int32 values class SortedIndividualInt32List { @@ -677,8 +674,6 @@ inline ConvertDataLinear::ConvertDataLinear( const sal_Char* p, double fC, doubl } - - /// Helper class for date calculation for various financial functions class ScaDate { diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 685a7f7e2db6..4c2f3a4a0a8c 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -44,7 +44,6 @@ #define RETURN_FINITE(d) if( ::rtl::math::isFinite( d ) ) return d; else throw css::lang::IllegalArgumentException() - namespace sca { namespace pricing { @@ -183,8 +182,6 @@ struct FindScaFuncData } // namespace sca - - css::uno::Reference< css::uno::XInterface > SAL_CALL PricingFunctionAddIn_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx index 3943c3470f7f..aee5ae04ada7 100644 --- a/scripting/source/basprov/baslibnode.cxx +++ b/scripting/source/basprov/baslibnode.cxx @@ -32,12 +32,10 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; - namespace basprov { - // BasicLibraryNodeImpl @@ -59,7 +57,6 @@ namespace basprov } - BasicLibraryNodeImpl::~BasicLibraryNodeImpl() { } @@ -76,7 +73,6 @@ namespace basprov } - Sequence< Reference< browse::XBrowseNode > > BasicLibraryNodeImpl::getChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -110,7 +106,6 @@ namespace basprov } - sal_Bool BasicLibraryNodeImpl::hasChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -123,7 +118,6 @@ namespace basprov } - sal_Int16 BasicLibraryNodeImpl::getType( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -132,8 +126,6 @@ namespace basprov } - - } // namespace basprov diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx index f9a82af1e846..0fd6174905c4 100644 --- a/scripting/source/basprov/baslibnode.hxx +++ b/scripting/source/basprov/baslibnode.hxx @@ -29,12 +29,10 @@ class BasicManager; - namespace basprov { - // class BasicLibraryNodeImpl diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx index 9fe6d521fb3e..cc6637eb9464 100644 --- a/scripting/source/basprov/basmethnode.cxx +++ b/scripting/source/basprov/basmethnode.cxx @@ -49,12 +49,10 @@ using namespace ::sf_misc; #define BASPROV_DEFAULT_ATTRIBS() PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY - namespace basprov { - // BasicMethodNodeImpl @@ -96,7 +94,6 @@ namespace basprov } - BasicMethodNodeImpl::~BasicMethodNodeImpl() { } @@ -129,7 +126,6 @@ namespace basprov } - Sequence< Reference< browse::XBrowseNode > > BasicMethodNodeImpl::getChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -138,7 +134,6 @@ namespace basprov } - sal_Bool BasicMethodNodeImpl::hasChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -147,7 +142,6 @@ namespace basprov } - sal_Int16 BasicMethodNodeImpl::getType( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -195,7 +189,6 @@ namespace basprov } - Any BasicMethodNodeImpl::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, script::CannotConvertException, @@ -284,7 +277,6 @@ namespace basprov } - void BasicMethodNodeImpl::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, RuntimeException, std::exception) @@ -297,7 +289,6 @@ namespace basprov } - Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { (void)aPropertyName; @@ -307,7 +298,6 @@ namespace basprov } - sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) { bool bReturn = false; @@ -318,7 +308,6 @@ namespace basprov } - sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) { (void)aName; @@ -327,8 +316,6 @@ namespace basprov } - - } // namespace basprov diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx index 547d5a10d1e2..537d15c4735e 100644 --- a/scripting/source/basprov/basmethnode.hxx +++ b/scripting/source/basprov/basmethnode.hxx @@ -34,12 +34,10 @@ class SbMethod; - namespace basprov { - // class BasicMethodNodeImpl diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx index 645931103464..a08def174eda 100644 --- a/scripting/source/basprov/basmodnode.cxx +++ b/scripting/source/basprov/basmodnode.cxx @@ -34,12 +34,10 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; - namespace basprov { - // BasicModuleNodeImpl @@ -53,7 +51,6 @@ namespace basprov } - BasicModuleNodeImpl::~BasicModuleNodeImpl() { } @@ -74,7 +71,6 @@ namespace basprov } - Sequence< Reference< browse::XBrowseNode > > BasicModuleNodeImpl::getChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -111,7 +107,6 @@ namespace basprov } - sal_Bool BasicModuleNodeImpl::hasChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -128,7 +123,6 @@ namespace basprov } - sal_Int16 BasicModuleNodeImpl::getType( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -137,8 +131,6 @@ namespace basprov } - - } // namespace basprov diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx index 7af9c97b8107..914184c5f4b7 100644 --- a/scripting/source/basprov/basmodnode.hxx +++ b/scripting/source/basprov/basmodnode.hxx @@ -28,12 +28,10 @@ class SbModule; - namespace basprov { - // class BasicModuleNodeImpl diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 94a662c3f205..20f6a99820cf 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -63,7 +63,6 @@ namespace basprov { - // component operations @@ -73,7 +72,6 @@ namespace basprov } - static Sequence< OUString > getSupportedServiceNames_BasicProviderImpl() { static Sequence< OUString >* pNames = nullptr; @@ -109,13 +107,11 @@ namespace basprov } - BasicProviderImpl::~BasicProviderImpl() { } - bool BasicProviderImpl::isLibraryShared( const Reference< script::XLibraryContainer >& rxLibContainer, const OUString& rLibName ) { bool bIsShared = false; @@ -278,7 +274,6 @@ namespace basprov } - // XScriptProvider @@ -411,7 +406,6 @@ namespace basprov } - Sequence< Reference< browse::XBrowseNode > > BasicProviderImpl::getChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -469,7 +463,6 @@ namespace basprov } - sal_Bool BasicProviderImpl::hasChildNodes( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -491,7 +484,6 @@ namespace basprov } - sal_Int16 BasicProviderImpl::getType( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -510,7 +502,6 @@ namespace basprov } - static struct ::cppu::ImplementationEntry s_component_entries [] = { { @@ -522,13 +513,9 @@ namespace basprov }; - - } // namespace basprov - - // component exports diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx index 646be1ebd1cf..c99a536ce993 100644 --- a/scripting/source/basprov/basprov.hxx +++ b/scripting/source/basprov/basprov.hxx @@ -33,12 +33,10 @@ class BasicManager; - namespace basprov { - // class BasicProviderImpl diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx index 00b2a40f880e..2aef934b62be 100644 --- a/scripting/source/basprov/basscript.cxx +++ b/scripting/source/basprov/basscript.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::beans; - namespace basprov { @@ -57,8 +56,6 @@ namespace basprov // BasicScriptImpl - - BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) @@ -71,7 +68,6 @@ namespace basprov } - BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod, BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) @@ -292,8 +288,6 @@ namespace basprov } - - } // namespace basprov diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx index 6805cd69cc34..0f8616bd4034 100644 --- a/scripting/source/basprov/basscript.hxx +++ b/scripting/source/basprov/basscript.hxx @@ -36,7 +36,6 @@ namespace basprov { - // class BasicScriptImpl diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 5d1c1401db75..dd2d18f92e7c 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -53,7 +53,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::reflection; - namespace dlgprov { @@ -148,8 +147,6 @@ namespace dlgprov } - - // DialogEventsAttacherImpl @@ -182,7 +179,6 @@ namespace dlgprov } - DialogEventsAttacherImpl::~DialogEventsAttacherImpl() { } @@ -371,7 +367,6 @@ namespace dlgprov } - // DialogAllListenerImpl @@ -384,13 +379,11 @@ namespace dlgprov } - DialogAllListenerImpl::~DialogAllListenerImpl() { } - void DialogAllListenerImpl::firing_impl( const AllEventObject& Event, Any* pRet ) { ScriptEvent aScriptEvent; @@ -431,7 +424,6 @@ namespace dlgprov } - Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event ) throw ( reflection::InvocationTargetException, RuntimeException, std::exception ) { @@ -443,7 +435,6 @@ namespace dlgprov } - // DialogScriptListenerImpl @@ -462,7 +453,6 @@ namespace dlgprov } - DialogScriptListenerImpl::~DialogScriptListenerImpl() { } @@ -671,7 +661,6 @@ namespace dlgprov } - Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent ) throw ( reflection::InvocationTargetException, RuntimeException, std::exception ) { @@ -683,8 +672,6 @@ namespace dlgprov } - - } // namespace dlgprov diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index cf38efd179e9..1bd7f6b2bbff 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -80,7 +80,6 @@ namespace dlgprov }; - // class DialogAllListenerImpl @@ -114,7 +113,6 @@ namespace dlgprov }; - // class DialogScriptListenerImpl @@ -143,7 +141,6 @@ namespace dlgprov }; - } // namespace dlgprov diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 33ccd6d04039..1af17ca3ba09 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -168,7 +168,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - static Sequence< OUString > getSupportedServiceNames_DialogProviderImpl() { Sequence< OUString > aNames(3); @@ -179,7 +178,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - // mutex @@ -199,7 +197,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - // DialogProviderImpl @@ -210,13 +207,11 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - DialogProviderImpl::~DialogProviderImpl() { } - Reference< resource::XStringResourceManager > getStringResourceFromDialogLibrary ( Reference< container::XNameContainer > xDialogLib ) { @@ -451,7 +446,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - Reference< XUnoControlDialog > DialogProviderImpl::createDialogControl ( const Reference< XControlModel >& rxDialogModel, const Reference< XWindowPeer >& xParent ) { @@ -496,7 +490,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - void DialogProviderImpl::attachControlEvents( const Reference< XControl >& rxControl, const Reference< XInterface >& rxHandler, @@ -562,7 +555,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - // XServiceInfo @@ -762,7 +754,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - // component operations @@ -773,7 +764,6 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; } - static struct ::cppu::ImplementationEntry s_component_entries [] = { {create_DialogProviderImpl, getImplementationName_DialogProviderImpl,getSupportedServiceNames_DialogProviderImpl, ::cppu::createSingleComponentFactory,nullptr, 0}, @@ -782,13 +772,9 @@ static const char aResourceResolverPropName[] = "ResourceResolver"; }; - - } // namespace dlgprov - - // component exports diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 44fd78b07498..39ef5fa793a2 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -44,14 +44,12 @@ namespace dlgprov { - // mutex ::osl::Mutex& getMutex(); - // class DialogProviderImpl css::uno::Reference< css::container::XNameContainer > lcl_createControlModel(const css::uno::Reference< css::uno::XComponentContext >& i_xContext); @@ -154,7 +152,6 @@ namespace dlgprov } // namespace dlgprov - // component helper namespace namespace comp_DialogModelProvider { @@ -165,8 +162,6 @@ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); } // namespace comp_DialogModelProvider - - #endif // INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGPROV_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/inc/bcholder.hxx b/scripting/source/inc/bcholder.hxx index 285c55c9d115..380584dce24b 100644 --- a/scripting/source/inc/bcholder.hxx +++ b/scripting/source/inc/bcholder.hxx @@ -24,12 +24,10 @@ #include <cppuhelper/interfacecontainer.h> - namespace scripting_helper { - // class OMutexHolder diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 6a76ad2d8629..d637048e614f 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -658,7 +658,6 @@ BrowseNodeFactoryImpl::~BrowseNodeFactoryImpl() } - // Implementation of XBrowseNodeFactory @@ -703,7 +702,6 @@ BrowseNodeFactoryImpl::getOrganizerHierarchy() // Helper methods - // Namespace global methods for setting up BrowseNodeFactory service diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index e63236f5ef17..6b8a4a52b58c 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -203,7 +203,6 @@ throw ( Exception, RuntimeException, std::exception ) } - void MasterScriptProvider::createPkgProvider() { try @@ -361,7 +360,6 @@ throw ( provider::ScriptFrameworkErrorException, } - ProviderCache* MasterScriptProvider::providerCache() { @@ -387,7 +385,6 @@ MasterScriptProvider::providerCache() } - OUString SAL_CALL MasterScriptProvider::getName() throw ( css::uno::RuntimeException, std::exception ) @@ -464,7 +461,6 @@ MasterScriptProvider::getType() } - OUString MasterScriptProvider::parseLocationName( const OUString& location ) { @@ -773,7 +769,6 @@ MasterScriptProvider::getAllProviders() throw ( css::uno::RuntimeException ) } - OUString SAL_CALL MasterScriptProvider::getImplementationName( ) throw( RuntimeException, std::exception ) { diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 07b7aaf102df..70f4396e784a 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -48,12 +48,10 @@ using namespace ::com::sun::star::embed; using namespace ::com::sun::star::container; - namespace stringresource { - // mutex @@ -73,7 +71,6 @@ namespace stringresource } - // StringResourceImpl @@ -96,8 +93,6 @@ static Reference< XInterface > SAL_CALL create_StringResourceImpl( } - - StringResourceImpl::StringResourceImpl( const Reference< XComponentContext >& rxContext ) : m_xContext( rxContext ) , m_pCurrentLocaleItem( nullptr ) @@ -111,7 +106,6 @@ StringResourceImpl::StringResourceImpl( const Reference< XComponentContext >& rx } - StringResourceImpl::~StringResourceImpl() { for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it ) @@ -128,7 +122,6 @@ StringResourceImpl::~StringResourceImpl() } - // XServiceInfo OUString StringResourceImpl::getImplementationName( ) throw (RuntimeException, std::exception) @@ -147,7 +140,6 @@ Sequence< OUString > StringResourceImpl::getSupportedServiceNames( ) throw (Run } - // XModifyBroadcaster void StringResourceImpl::addModifyListener( const Reference< XModifyListener >& aListener ) @@ -171,7 +163,6 @@ void StringResourceImpl::removeModifyListener( const Reference< XModifyListener } - // XStringResourceResolver OUString StringResourceImpl::implResolveString @@ -319,7 +310,6 @@ Sequence< Locale > StringResourceImpl::getLocales( ) } - // XStringResourceManager void StringResourceImpl::implCheckReadOnly( const sal_Char* pExceptionMsg ) @@ -636,7 +626,6 @@ sal_Int32 StringResourceImpl::getUniqueNumericId( ) } - // Private helper methods LocaleItem* StringResourceImpl::getItemForLocale @@ -718,7 +707,6 @@ void StringResourceImpl::implNotifyListeners() } - // Loading bool StringResourceImpl::loadLocale( LocaleItem* pLocaleItem ) @@ -762,7 +750,6 @@ StringResourcePersistenceImpl::StringResourcePersistenceImpl( const Reference< X } - StringResourcePersistenceImpl::~StringResourcePersistenceImpl() { } @@ -778,7 +765,6 @@ OUString StringResourcePersistenceImpl::getImplementationName( ) } - sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { @@ -786,7 +772,6 @@ sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServic } - Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { @@ -1240,7 +1225,6 @@ void StringResourcePersistenceImpl::implStoreAtLocation } - // BinaryOutput, helper class for exportBinary class BinaryOutput @@ -1652,7 +1636,6 @@ void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& } - // Private helper methods bool checkNamingSceme( const OUString& aName, const OUString& aNameBase, @@ -2254,7 +2237,6 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem* pLocale } - // StringResourceWithStorageImpl @@ -2277,7 +2259,6 @@ static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl( } - StringResourceWithStorageImpl::StringResourceWithStorageImpl( const Reference< XComponentContext >& rxContext ) : StringResourceWithStorageImpl_BASE( rxContext ) , m_bStorageChanged( false ) @@ -2285,7 +2266,6 @@ StringResourceWithStorageImpl::StringResourceWithStorageImpl( const Reference< X } - StringResourceWithStorageImpl::~StringResourceWithStorageImpl() { } @@ -2532,7 +2512,6 @@ void StringResourceWithStorageImpl::setStorage( const Reference< XStorage >& Sto } - // Private helper methods @@ -2578,7 +2557,6 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) } - // StringResourceWithLocationImpl @@ -2601,7 +2579,6 @@ static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl( } - StringResourceWithLocationImpl::StringResourceWithLocationImpl( const Reference< XComponentContext >& rxContext ) : StringResourceWithLocationImpl_BASE( rxContext ) , m_bLocationChanged( false ) @@ -2609,7 +2586,6 @@ StringResourceWithLocationImpl::StringResourceWithLocationImpl( const Reference< } - StringResourceWithLocationImpl::~StringResourceWithLocationImpl() { } @@ -2886,7 +2862,6 @@ void StringResourceWithLocationImpl::setURL( const OUString& URL ) } - // Private helper methods @@ -2944,7 +2919,6 @@ const Reference< ucb::XSimpleFileAccess3 > StringResourceWithLocationImpl::getFi } - // component export operations @@ -2972,12 +2946,9 @@ static const struct ::cppu::ImplementationEntry s_component_entries [] = }; - } // namespace dlgprov - - // component exports diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 7d4dc714ee90..8742713a979b 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -40,14 +40,12 @@ namespace stringresource { - // mutex ::osl::Mutex& getMutex(); - // class stringresourceImpl diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 5566b47b9bbc..ec8dd63723ff 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -245,5 +245,4 @@ com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation(css::uno::XCompone } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 70b59105ca37..710687da1290 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -341,5 +341,4 @@ com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index 2e0b5b33dfa5..a7a77e83f463 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -163,7 +163,6 @@ void ConfigurationClassifier::CopyResources ( } - } } // end of namespace sd::framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 96d348c3429e..04b354e3c2b4 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -529,5 +529,4 @@ com_sun_star_comp_Draw_framework_ResourceID_get_implementation(css::uno::XCompon } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 9a83bca1b95c..870bc59e3c7b 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -540,5 +540,4 @@ com_sun_star_comp_Draw_framework_BasicViewFactory_get_implementation(css::uno::X } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 47ca4653ba6f..517baa9b0543 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -239,5 +239,4 @@ com_sun_star_comp_Draw_framework_PresentationFactoryProvider_get_implementation( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 43d5b7b28684..85afd83005bb 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -993,5 +993,4 @@ com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation(css::uno::XComp } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 6b1a76f0ec6a..60ee6db6e452 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -473,5 +473,4 @@ com_sun_star_comp_Draw_PresenterHelper_get_implementation(css::uno::XComponentCo } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index dac0ce3baddf..30df3ebfd66b 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -384,5 +384,4 @@ com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation(css::uno::XCompo } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 02f0b311dd81..0ccf0fbc500e 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -527,5 +527,4 @@ com_sun_star_comp_Draw_PresenterTextView_get_implementation(css::uno::XComponent } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 8ca8b5af667b..a81087ecef66 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -218,5 +218,4 @@ com_sun_star_comp_Draw_SlideRenderer_get_implementation(css::uno::XComponentCont } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 2f190494101d..a1b3df07f5da 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -74,7 +74,6 @@ void RegisterInterfaces(SfxModule* pMod) // - TableObjectBar - - SFX_IMPL_INTERFACE(TableObjectBar, SfxShell) void TableObjectBar::InitInterface_Impl() diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 46a11572163f..3dc848ec6db1 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -50,7 +50,6 @@ namespace sd { // - MediaObjectBar - - SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell) void MediaObjectBar::InitInterface_Impl() diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index e0c5f084954e..d525695974f6 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -498,13 +498,11 @@ ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxContext, con } - ImpOptimizer::~ImpOptimizer() { } - void ImpOptimizer::DispatchStatus() { if ( mxStatusDispatcher.is() ) @@ -517,7 +515,6 @@ void ImpOptimizer::DispatchStatus() } - bool ImpOptimizer::Optimize() { diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 5deb2bdcdab1..88bf86d6432f 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -54,9 +54,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; - - - OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, bool bMultiLine, sal_Int16 nTabIndex ) { @@ -311,7 +308,6 @@ void InformationDialog::InitDialog() } - InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) : UnoDialog( rxContext, rxFrame ), ConfigurationAccess( rxContext, nullptr ), @@ -332,7 +328,6 @@ InformationDialog::InformationDialog( const Reference< XComponentContext > &rxCo } - InformationDialog::~InformationDialog() { } @@ -357,7 +352,6 @@ bool InformationDialog::execute() } - void OKActionListener::actionPerformed( const ActionEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) { diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx index 9518bb1cef31..74c3c141f99e 100644 --- a/sdext/source/minimizer/optimizationstats.cxx +++ b/sdext/source/minimizer/optimizationstats.cxx @@ -32,20 +32,17 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; - OptimizationStats::OptimizationStats() { } - void OptimizationStats::SetStatusValue( const PPPOptimizerTokenEnum eStat, const uno::Any& rStatValue ) { maStats[ eStat ] = rStatValue; } - const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum eStat ) const { std::map< PPPOptimizerTokenEnum, uno::Any, Compare >::const_iterator aIter( maStats.find( eStat ) ); @@ -53,7 +50,6 @@ const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum e } - css::beans::PropertyValues OptimizationStats::GetStatusSequence() { int i = 0; @@ -68,7 +64,6 @@ css::beans::PropertyValues OptimizationStats::GetStatusSequence() } - void OptimizationStats::InitializeStatusValues( const uno::Sequence< PropertyValue >& rOptimizationStats ) { for( int i = 0; i < rOptimizationStats.getLength(); i++ ) @@ -76,7 +71,6 @@ void OptimizationStats::InitializeStatusValues( const uno::Sequence< PropertyVal } - void OptimizationStats::InitializeStatusValuesFromDocument( Reference< XModel > rxModel ) { try diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 2de2347e91b8..6423ffc39b8d 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; - - void OptimizerDialog::InitDialog() { // setting the dialog properties @@ -79,7 +77,6 @@ void OptimizerDialog::InitDialog() } - void OptimizerDialog::InitRoadmap() { try @@ -134,7 +131,6 @@ void OptimizerDialog::InitRoadmap() } - void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID ) { try @@ -155,7 +151,6 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const bool bEna } - void OptimizerDialog::UpdateConfiguration() { sal_Int16 nInt16 = 0; @@ -204,7 +199,6 @@ void OptimizerDialog::UpdateConfiguration() } - OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, Reference< XDispatch > rxStatusDispatcher ) : UnoDialog( rxContext, rxFrame ), ConfigurationAccess( rxContext, nullptr ), @@ -239,7 +233,6 @@ OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContex } - OptimizerDialog::~OptimizerDialog() { // not saving configuration if the dialog has been finished via cancel or close window @@ -260,7 +253,6 @@ bool OptimizerDialog::execute() } - void OptimizerDialog::SwitchPage( sal_Int16 nNewStep ) { if ( ( nNewStep != mnCurrentStep ) && ( nNewStep <= MAX_STEP ) && ( nNewStep >= 0 ) ) @@ -307,7 +299,6 @@ void OptimizerDialog::UpdateControlStates( sal_Int16 nPage ) } - OUString OptimizerDialog::GetSelectedString( OUString const & token ) { OUString aSelectedItem; @@ -328,7 +319,6 @@ OUString OptimizerDialog::GetSelectedString( OUString const & token ) } - void OptimizerDialog::UpdateStatus( const css::uno::Sequence< css::beans::PropertyValue >& rStatus ) { if ( mxReschedule.is() ) @@ -360,7 +350,6 @@ void OptimizerDialog::UpdateStatus( const css::uno::Sequence< css::beans::Proper } - void ItemListener::itemStateChanged( const ItemEvent& Event ) throw ( RuntimeException, std::exception ) { @@ -495,7 +484,6 @@ void ItemListener::disposing( const css::lang::EventObject& /* Source */ ) } - void ActionListener::actionPerformed( const ActionEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) { @@ -645,7 +633,6 @@ void ActionListener::disposing( const css::lang::EventObject& /* Source */ ) } - void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) { @@ -664,7 +651,6 @@ void ActionListenerListBox0Pg0::disposing( const css::lang::EventObject& /* Sour } - void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ ) throw ( css::uno::RuntimeException, std::exception ) { @@ -679,7 +665,6 @@ void TextListenerFormattedField0Pg1::disposing( const css::lang::EventObject& /* } - void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ ) throw ( css::uno::RuntimeException, std::exception ) { @@ -708,7 +693,6 @@ void TextListenerComboBox0Pg1::disposing( const css::lang::EventObject& /* Sourc } - void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ ) throw ( css::uno::RuntimeException, std::exception ) { diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 6f6542684d15..9c4ed551a4c4 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -127,7 +127,6 @@ public: }; - class ItemListener : public ::cppu::WeakImplHelper< css::awt::XItemListener > { public: @@ -141,7 +140,6 @@ private: }; - class ActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListener > { public: @@ -155,7 +153,6 @@ private: }; - class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper< css::awt::XActionListener > { public: @@ -169,7 +166,6 @@ private: }; - class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt::XTextListener > { public: @@ -183,7 +179,6 @@ private: }; - class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper< css::awt::XTextListener > { public: @@ -197,7 +192,6 @@ private: }; - class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt::XSpinListener > { public: diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 8977a7096e3c..764ace4f5087 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; - void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl ) { FontDescriptor aFontDescriptor; @@ -58,7 +57,6 @@ void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl ) } - OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation, sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight ) { @@ -89,7 +87,6 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo } - OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType ) { @@ -126,7 +123,6 @@ OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rContr } - OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, bool bMultiLine, bool bBold, sal_Int16 nTabIndex ) { @@ -162,7 +158,6 @@ OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rCo } - OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener >& xItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) @@ -199,7 +194,6 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon } - OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XTextListener >& xTextListener, const Reference< XSpinListener >& xSpinListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, double fEffectiveMin, double fEffectiveMax, sal_Int16 nTabIndex ) @@ -247,7 +241,6 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString } - OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XTextListener >& rTextListener, const bool bEnabled, const Sequence< OUString >& rItemList, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) @@ -288,7 +281,6 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon } - OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener >& rItemListener, const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, bool bMultiLine, sal_Int16 nTabIndex ) { @@ -324,7 +316,6 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r } - OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XActionListener >& rActionListener, const bool bEnabled, const Sequence< OUString >& rItemList, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex ) @@ -367,7 +358,6 @@ OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rCont } - void OptimizerDialog::InitNavigationBar() { sal_Int32 nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6; @@ -387,7 +377,6 @@ void OptimizerDialog::InitNavigationBar() } - void OptimizerDialog::UpdateControlStatesPage0() { sal_uInt32 i; @@ -436,7 +425,6 @@ void OptimizerDialog::InitPage0() } - void OptimizerDialog::UpdateControlStatesPage1() { bool bDeleteUnusedMasterPages( GetConfigProperty( TK_DeleteUnusedMasterPages, false ) ); @@ -476,7 +464,6 @@ void OptimizerDialog::InitPage1() } - void OptimizerDialog::UpdateControlStatesPage2() { bool bJPEGCompression( GetConfigProperty( TK_JPEGCompression, false ) ); @@ -541,7 +528,6 @@ void OptimizerDialog::InitPage2() } - void OptimizerDialog::UpdateControlStatesPage3() { bool bConvertOLEObjects( GetConfigProperty( TK_OLEOptimization, false ) ); @@ -583,7 +569,6 @@ void OptimizerDialog::InitPage3() } - static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator = '.' ) { double fVal( static_cast<double>( rVal ) ); diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index 74219a8d3716..d8a0c2e0e6b1 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -41,7 +41,6 @@ PPPOptimizer::PPPOptimizer( } - PPPOptimizer::~PPPOptimizer() { } @@ -63,7 +62,6 @@ Reference< css::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispatch( } - Sequence< Reference< css::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispatches( const Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException, std::exception ) { diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index 203b66c8f257..03c83c722d0c 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -97,7 +97,6 @@ css::uno::Reference< css::uno::XInterface > PPPOptimizerDialog_createInstance( c throw( css::uno::Exception ); - #endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZERDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 0c0f99946e66..e079926b5b21 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -67,14 +67,12 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference } - UnoDialog::~UnoDialog() { } - void UnoDialog::execute() { mxDialog->setEnable( sal_True ); @@ -89,7 +87,6 @@ void UnoDialog::endExecute( bool bStatus ) } - Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > xParentPeer ) throw ( Exception ) { @@ -104,7 +101,6 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x } - Reference< XInterface > UnoDialog::insertControlModel( const OUString& rServiceName, const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { @@ -123,7 +119,6 @@ Reference< XInterface > UnoDialog::insertControlModel( const OUString& rServiceN } - void UnoDialog::setVisible( const OUString& rName, bool bVisible ) { try @@ -138,7 +133,6 @@ void UnoDialog::setVisible( const OUString& rName, bool bVisible ) } - Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference< XActionListener > xActionListener, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { @@ -165,7 +159,6 @@ Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference< } - Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { Reference< XFixedText > xFixedText; @@ -183,7 +176,6 @@ Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const } - Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { Reference< XCheckBox > xCheckBox; @@ -201,7 +193,6 @@ Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const S } - Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { Reference< XControl > xControl; @@ -219,7 +210,6 @@ Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, co } - Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { Reference< XComboBox > xControl; @@ -237,7 +227,6 @@ Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const S } - Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { Reference< XRadioButton > xControl; @@ -255,7 +244,6 @@ Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, c } - Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { Reference< XListBox > xControl; @@ -273,7 +261,6 @@ Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Seq } - Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues ) { Reference< XControl > xControl; @@ -291,7 +278,6 @@ Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Seque } - void UnoDialog::setControlProperty( const OUString& rControlName, const OUString& rPropertyName, const Any& rPropertyValue ) { try @@ -308,7 +294,6 @@ void UnoDialog::setControlProperty( const OUString& rControlName, const OUString } - Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString& rPropertyName ) { Any aRet; @@ -327,7 +312,6 @@ Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString& } - void UnoDialog::enableControl( const OUString& rControlName ) { const OUString sEnabled( "Enabled" ); @@ -335,7 +319,6 @@ void UnoDialog::enableControl( const OUString& rControlName ) } - void UnoDialog::disableControl( const OUString& rControlName ) { const OUString sEnabled( "Enabled" ); @@ -343,5 +326,4 @@ void UnoDialog::disableControl( const OUString& rControlName ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index bfdf33df06af..1aa752673328 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -181,9 +181,6 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned } - - - PDFDetector::PDFDetector( const uno::Reference< uno::XComponentContext >& xContext) : PDFDetectorBase( m_aMutex ), m_xContext( xContext ) diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 67fbc026043d..ca884753c8e5 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -35,7 +35,6 @@ #include <string.h> - namespace pdfparse { diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index a38050ad30b1..7d9cb9d112ef 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -383,7 +383,6 @@ void DrawXmlEmitter::visit( DocumentElement& elem, const std::list< Element* >:: } - void DrawXmlOptimizer::visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) { } diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 922479227cfe..8f46aa2f99d9 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -350,7 +350,6 @@ void WriterXmlEmitter::visit( DocumentElement& elem, const std::list< Element* > } - void WriterXmlOptimizer::visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) { } @@ -846,8 +845,6 @@ void WriterXmlOptimizer::visit( DocumentElement& elem, const std::list< Element* } - - void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& ) { // xxx TODO copied from DrawElement diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index d76311c37a15..eba4c5222aa8 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -444,8 +444,6 @@ inline void writeMaskLF( OutputBuffer& o_rOutputBuf, bool bInvert ) { writeMask_(o_rOutputBuf,str,width,height,true,bInvert); } - - int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) const { FontAttributes aNewFont; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 28e2fa9eda3c..65c05c57cc38 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -362,7 +362,6 @@ void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent) } - css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize() { if (mpFont.get()!=nullptr && !mpFont->mxFont.is() && mxCanvas.is()) diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 597c94a65d0b..79e4d020c31a 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -1102,7 +1102,6 @@ void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEv } - void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane) { if ( ! rxPane.is()) diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 6631cf017107..d1add25cd397 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -463,7 +463,6 @@ sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly() } - void PresenterHelpView::ProvideCanvas() { if ( ! mxCanvas.is() && mxPane.is()) diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 6bcfc1317f16..791c55bca828 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -421,7 +421,6 @@ void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent) } - void PresenterNotesView::Layout() { if ( ! mxParentWindow.is()) diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 79f53a97e1df..de2dfce53b55 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -140,7 +140,6 @@ void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent) } - void PresenterPane::CreateCanvases ( const Reference<awt::XWindow>& rxParentWindow, const Reference<rendering::XSpriteCanvas>& rxParentCanvas) diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index e6c827ff06e9..59505961b86b 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -315,7 +315,6 @@ void SAL_CALL PresenterPaneBase::disposing (const lang::EventObject& rEvent) } - void PresenterPaneBase::CreateWindows ( const Reference<awt::XWindow>& rxParentWindow, const bool bIsWindowVisibleOnCreation) diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 414971758c29..acfba8a4f7ae 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -477,7 +477,6 @@ void SAL_CALL PresenterPaneBorderManager::disposing (const lang::EventObject& rE } - void PresenterPaneBorderManager::CaptureMouse (const Reference<awt::XWindow>& rxWindow) { if (mxPresenterHelper.is()) diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 6a08ed838d9f..f6ecd4855969 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -292,7 +292,6 @@ awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset ( } - bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanvas>& rxCanvas) { bool bModified (false); diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 6655e15f9c5f..5167a9d748c4 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -217,7 +217,6 @@ void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>& } - Reference<XResource> PresenterPaneFactory::CreatePane ( const Reference<XResourceId>& rxPaneId, const OUString& rsTitle) diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 8cedd7475c75..4e273a4491e0 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -353,7 +353,6 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD } - void PresenterProtocolHandler::ThrowIfDisposed() const throw (css::lang::DisposedException) { diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 12839dce8c33..288cfa4e0a8e 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -328,7 +328,6 @@ void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/) } - void PresenterScreen::InitializePresenterScreen() { try diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 8b63eda4edce..f2c3ce51eed0 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -462,7 +462,6 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven } - geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) const { OSL_ASSERT(eArea>=0 && eArea<__AreaCount__); diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index dfe8da144ab4..759e13f24e87 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -217,7 +217,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage() } - void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPage) { mxCurrentSlide = rxPage; diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index a39c20ffdbeb..386eb04a867d 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -687,7 +687,6 @@ void PresenterSlideShowView::DeactivatePresenterView() } - void PresenterSlideShowView::PaintOuterWindow (const awt::Rectangle& rRepaintBox) { if ( ! mxCanvas.is()) diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 58e5ebef7814..271a33690e4c 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -682,7 +682,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage() } - void PresenterSlideSorter::UpdateLayout() { if ( ! mxWindow.is()) diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index ba43585dca9f..9c4161ccc2a0 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -147,7 +147,6 @@ void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent) } - std::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite() { return mpSprite; diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 3498906727cb..9299359bf3ee 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -1126,7 +1126,6 @@ void PresenterTextCaret::HideCaret() } - void PresenterTextCaret::SetPosition ( const sal_Int32 nParagraphIndex, const sal_Int32 nCharacterIndex) diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index d4c60398bbe3..a0cf3916cfd4 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -622,7 +622,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage() } - void PresenterToolBar::CreateControls ( const OUString& rsConfigurationPath) { diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 101a03b7b641..75a86f7ab8cc 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -287,7 +287,6 @@ void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>& } - Reference<XResource> PresenterViewFactory::GetViewFromCache( const Reference<XResourceId>& rxViewId, const Reference<XPane>& rxAnchorPane) const diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index bca2de7419fa..349928ef5f96 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -370,7 +370,6 @@ void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent } - bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const { bool bChildInvalidated (false); @@ -784,7 +783,6 @@ void PresenterWindowManager::LayoutNotesMode() } - } void PresenterWindowManager::LayoutSlideSorterMode() diff --git a/setup_native/source/win32/customactions/tools/seterror.hxx b/setup_native/source/win32/customactions/tools/seterror.hxx index e8a46c48c2d6..010af4a8c9ba 100644 --- a/setup_native/source/win32/customactions/tools/seterror.hxx +++ b/setup_native/source/win32/customactions/tools/seterror.hxx @@ -29,7 +29,6 @@ #define MSI_ERROR_DIRECTORY_NOT_EMPTY 9030 - void SetMsiErrorCode( int nErrorCode ); #endif diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index ca7c60f7270e..728fd86986dc 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -26,7 +26,6 @@ #include <sfx2/basedlgs.hxx> - namespace sfx2 { @@ -79,11 +78,9 @@ public: }; - } // namespace sfx2 - #endif // INCLUDED_SFX2_INC_SRCHDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index aaba69dcc98f..ab7d4c47b004 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -252,7 +252,6 @@ SfxApplication::~SfxApplication() } - const OUString& SfxApplication::GetLastDir_Impl() const /* [Description] @@ -286,7 +285,6 @@ const OUString& SfxApplication::GetLastSaveDirectory() const } - void SfxApplication::SetLastDir_Impl ( const OUString& rNewDir /* Complete directory path as a string */ @@ -306,14 +304,12 @@ void SfxApplication::SetLastDir_Impl } - void SfxApplication::ResetLastDir() { pAppData_Impl->aLastDir.clear(); } - SfxDispatcher* SfxApplication::GetDispatcher_Impl() { return pAppData_Impl->pViewFrame? pAppData_Impl->pViewFrame->GetDispatcher(): pAppData_Impl->pAppDispat; @@ -391,7 +387,6 @@ ResMgr* SfxApplication::GetSfxResManager() } - void SfxApplication::SetProgress_Impl ( SfxProgress *pProgress @@ -413,21 +408,18 @@ void SfxApplication::SetProgress_Impl } - sal_uInt16 SfxApplication::GetFreeIndex() { return pAppData_Impl->aIndexBitSet.GetFreeIndex()+1; } - void SfxApplication::ReleaseIndex(sal_uInt16 i) { pAppData_Impl->aIndexBitSet.ReleaseIndex(i-1); } - vcl::Window* SfxApplication::GetTopWindow() const { SfxWorkWindow* pWork = GetWorkWindow_Impl( SfxViewFrame::Current() ); diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 36f917d1d19d..9514ac61c574 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -120,7 +120,6 @@ XLibraryContainer * SfxApplication::GetDialogContainer() } - XLibraryContainer * SfxApplication::GetBasicContainer() { #if !HAVE_FEATURE_SCRIPTING diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index f88853f32210..f66096e9b8fb 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -80,7 +80,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; - class SfxEventAsyncer_Impl : public SfxListener { SfxEventHint aHint; @@ -95,7 +94,6 @@ public: }; - void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SfxSimpleHint* pHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -107,7 +105,6 @@ void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) : aHint( rHint ) { @@ -120,14 +117,12 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint ) } - SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl() { delete pIdle; } - IMPL_LINK_TYPED(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void) { SfxObjectShellRef xRef( aHint.GetObjShell() ); diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index 554406f1ef93..5475b22cea9b 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -35,8 +35,6 @@ #include <sfx2/sfxsids.hrc> - - void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFactory *pFact ) { if ( pMod ) @@ -126,7 +124,6 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1 } - SfxChildWinFactArr_Impl& SfxApplication::GetChildWinFactories_Impl() const { return ( *(pAppData_Impl->pFactArr)); diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 62b81f441cb2..268879cf9e19 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -376,7 +376,6 @@ bool SfxObjectShell::DdeGetData( const OUString&, // the Item to be } - /* [Description] This method can be overridden by application developers, to receive diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 2ac45255c8cd..6e98b24bc1ed 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -151,7 +151,6 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName } - typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index ed854b65d672..d70a95231d52 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -43,7 +43,6 @@ #include "workwin.hxx" - SfxFilterMatcher& SfxApplication::GetFilterMatcher() { if( !pAppData_Impl->pMatcher ) diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 2cc7a4a28379..f0814edbf5f3 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -145,7 +145,6 @@ private: } - ::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ) { ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; @@ -177,9 +176,6 @@ private: } - - - sal_uInt32 CheckPasswd_Impl ( SfxObjectShell* pDoc, @@ -282,8 +278,6 @@ sal_uInt32 CheckPasswd_Impl } - - sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, bool bCopy, SfxItemSet* pSet ) { const SfxFilter* pFilter = nullptr; @@ -408,7 +402,6 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri } - void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) { const SfxStringItem* pFactoryItem = rReq.GetArg<SfxStringItem>(SID_NEWDOCDIRECT); @@ -441,7 +434,6 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) } - void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) { // No Parameter from BASIC only Factory given? @@ -547,7 +539,6 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) } - namespace { /** diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index fb04a9dcfa8e..9be3e6c3ba96 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -41,7 +41,6 @@ #include <sfx2/mnuitem.hxx> - void SfxApplication::Registrations_Impl() { // Interfaces @@ -64,7 +63,6 @@ void SfxApplication::Registrations_Impl() } - void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, const SfxTbxCtrlFactory& rFact ) { if ( pMod ) @@ -89,7 +87,6 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, const SfxTbxC } - void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, const SfxStbCtrlFactory& rFact ) { if ( pMod ) @@ -114,7 +111,6 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, const SfxSt } - void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, const SfxMenuCtrlFactory& rFact ) { if ( pMod ) diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 2548c247692e..6ff0a97fcd81 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -689,7 +689,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) } - void SfxApplication::MiscState_Impl(SfxItemSet &rSet) { const sal_uInt16 *pRanges = rSet.GetRanges(); diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 4a2e6a1fa66d..7c3089beaabb 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1672,7 +1672,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL } - RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > rModel, const uno::Sequence< beans::PropertyValue >& rProperties ) { diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index b827f2333d8c..0965bae9acde 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -68,7 +68,6 @@ struct SfxChildWindow_Impl }; - class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener > { public: @@ -112,7 +111,6 @@ class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener }; - bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize ) { if ( comphelper::string::getTokenCount(rStr, '/') != 4 ) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 4a9bf91bd3af..4b2a4960a63b 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -558,7 +558,6 @@ bool SvFileObject::IsDataComplete() const } - void SvFileObject::CancelTransfers() { // unsubscribe from the cache if in the middle of loading diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index 25ac27d7497d..57e11602715e 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -41,7 +41,6 @@ HelpDispatch_Impl::HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor, } - HelpDispatch_Impl::~HelpDispatch_Impl() { } @@ -88,7 +87,6 @@ void SAL_CALL HelpDispatch_Impl::dispatch( } - void SAL_CALL HelpDispatch_Impl::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) @@ -99,7 +97,6 @@ void SAL_CALL HelpDispatch_Impl::addStatusListener( } - void SAL_CALL HelpDispatch_Impl::removeStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index cb7c58680a44..b8f63d69b1ff 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -46,7 +46,6 @@ HelpInterceptor_Impl::HelpInterceptor_Impl() : } - HelpInterceptor_Impl::~HelpInterceptor_Impl() { if ( m_pHistory ) @@ -58,7 +57,6 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl() } - void HelpInterceptor_Impl::addURL( const OUString& rURL ) { if ( !m_pHistory ) @@ -103,7 +101,6 @@ void HelpInterceptor_Impl::addURL( const OUString& rURL ) } - void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) { m_xIntercepted.set( xFrame, UNO_QUERY ); @@ -113,7 +110,6 @@ void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) } - bool HelpInterceptor_Impl::HasHistoryPred() const { return m_pHistory && ( m_nCurPos > 0 ); @@ -125,7 +121,6 @@ bool HelpInterceptor_Impl::HasHistorySucc() const } - // XDispatchProvider Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( @@ -152,7 +147,6 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( } - Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) @@ -182,7 +176,6 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchPr } - void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< XDispatchProvider >& xNewSlave ) throw( RuntimeException, std::exception ) @@ -192,7 +185,6 @@ void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< X } - Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchProvider() throw( RuntimeException, std::exception ) @@ -202,7 +194,6 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchP } - void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< XDispatchProvider >& xNewMaster ) throw( RuntimeException, std::exception ) @@ -264,7 +255,6 @@ void SAL_CALL HelpInterceptor_Impl::dispatch( } - void SAL_CALL HelpInterceptor_Impl::addStatusListener( const Reference< XStatusListener >& xControl, const URL& ) throw( RuntimeException, std::exception ) { @@ -273,7 +263,6 @@ void SAL_CALL HelpInterceptor_Impl::addStatusListener( } - void SAL_CALL HelpInterceptor_Impl::removeStatusListener( const Reference< XStatusListener >&, const URL&) throw( RuntimeException, std::exception ) { @@ -289,7 +278,6 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter ) } - void SAL_CALL HelpListener_Impl::statusChanged( const css::frame::FeatureStateEvent& Event ) throw( css::uno::RuntimeException, std::exception ) { @@ -299,7 +287,6 @@ void SAL_CALL HelpListener_Impl::statusChanged( const css::frame::FeatureStateEv } - void SAL_CALL HelpListener_Impl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 442b5fb4d3ca..86af5a62201d 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -77,7 +77,6 @@ public: OUString GetCurrentURL() const { return m_aCurrentURL; } - const css::uno::Any& GetViewData()const {return m_aViewData;} bool HasHistoryPred() const; // is there a predecessor for the current in the history diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index e39c5c0187ec..9c9564f76393 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -103,7 +103,6 @@ void LinkManager::CloseCachedComps() } - void LinkManager::Remove( SvBaseLink *pLink ) { // No duplicate links inserted @@ -344,7 +343,6 @@ void LinkManager::UpdateAllLinks( } - SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink ) { switch( pLink->GetObjType() ) @@ -510,7 +508,6 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId() } - bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, const css::uno::Any & rValue, Graphic& rGrf ) @@ -554,7 +551,6 @@ bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, } - OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) { OUString sRet; @@ -694,5 +690,4 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 930939ebdf4a..4dd45bef9a5e 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -121,7 +121,6 @@ public: }; - SvBaseLink::SvBaseLink() : pImpl ( new BaseLink_Impl ), m_bIsReadOnly(false) @@ -133,7 +132,6 @@ SvBaseLink::SvBaseLink() } - SvBaseLink::SvBaseLink( SfxLinkUpdateMode nUpdateMode, SotClipboardFormatId nContentType ) : pImpl( new BaseLink_Impl ), m_bIsReadOnly(false) @@ -255,7 +253,6 @@ IMPL_LINK_TYPED( SvBaseLink, EndEditHdl, const OUString&, _rNewName, void ) } - void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP ) { DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" ); @@ -265,14 +262,12 @@ void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP ) } - void SvBaseLink::SetName( const OUString & rNm ) { aLinkName = rNm; } - void SvBaseLink::SetObj( SvLinkSource * pObj ) { DBG_ASSERT( (nObjType & OBJECT_CLIENT_SO && @@ -283,7 +278,6 @@ void SvBaseLink::SetObj( SvLinkSource * pObj ) } - void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm ) { if( aLinkName == rLnkNm ) @@ -301,10 +295,6 @@ void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm ) } - - - - void SvBaseLink::SetUpdateMode( SfxLinkUpdateMode nMode ) { if( ( OBJECT_CLIENT_SO & nObjType ) && diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 9d46fbf4208e..fca413c8e997 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -176,7 +176,6 @@ void SfxModule::Construct_Impl() } - SfxModule::~SfxModule() { if( !bDummy ) @@ -203,14 +202,12 @@ SfxModule::~SfxModule() } - SfxSlotPool* SfxModule::GetSlotPool() const { return pImpl->pSlotPool; } - void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) { DBG_ASSERT( pImpl, "No real Module!" ); @@ -232,7 +229,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact) } - void SfxModule::RegisterToolBoxControl( const SfxTbxCtrlFactory& rFact ) { if (!pImpl->pTbxCtrlFac) @@ -254,7 +250,6 @@ void SfxModule::RegisterToolBoxControl( const SfxTbxCtrlFactory& rFact ) } - void SfxModule::RegisterStatusBarControl( const SfxStbCtrlFactory& rFact ) { if (!pImpl->pStbCtrlFac) @@ -276,7 +271,6 @@ void SfxModule::RegisterStatusBarControl( const SfxStbCtrlFactory& rFact ) } - void SfxModule::RegisterMenuControl( const SfxMenuCtrlFactory& rFact ) { if (!pImpl->pMenuCtrlFac) @@ -298,28 +292,24 @@ void SfxModule::RegisterMenuControl( const SfxMenuCtrlFactory& rFact ) } - SfxTbxCtrlFactArr_Impl* SfxModule::GetTbxCtrlFactories_Impl() const { return pImpl->pTbxCtrlFac; } - SfxStbCtrlFactArr_Impl* SfxModule::GetStbCtrlFactories_Impl() const { return pImpl->pStbCtrlFac; } - SfxMenuCtrlFactArr_Impl* SfxModule::GetMenuCtrlFactories_Impl() const { return pImpl->pMenuCtrlFac; } - SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const { return pImpl->pFactArr; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 065cbc7083fa..aa96d2cc7e33 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -339,7 +339,6 @@ void ContentListBox_Impl::InitRoot() } - void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) { SvTreeListEntry* pEntry = FirstChild( pParent ); @@ -352,7 +351,6 @@ void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent ) } - void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { try @@ -398,7 +396,6 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) } - bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -413,7 +410,6 @@ bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) } - OUString ContentListBox_Impl::GetSelectEntry() const { OUString aRet; @@ -513,7 +509,6 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) } - bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -528,7 +523,6 @@ bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) } - void IndexBox_Impl::SelectExecutableEntry() { sal_Int32 nPos = GetEntryPos( GetText() ); @@ -583,7 +577,6 @@ void IndexTabPage_Impl::dispose() } - namespace sfx2 { typedef std::unordered_map< OUString, int, OUStringHash > KeywordInfo; @@ -609,7 +602,6 @@ namespace sfx2 { m_pIndexCB->SetEntryData( nPos, NEW_ENTRY( aRefList[j], insert ) ); - void IndexTabPage_Impl::InitializeIndex() { WaitObject aWaitCursor( this ); @@ -726,7 +718,6 @@ void IndexTabPage_Impl::InitializeIndex() #undef UNIFY_AND_INSERT_TOKEN - void IndexTabPage_Impl::ClearIndex() { const sal_Int32 nCount = m_pIndexCB->GetEntryCount(); @@ -796,7 +787,6 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory ) } - OUString IndexTabPage_Impl::GetSelectEntry() const { OUString aRet; @@ -807,7 +797,6 @@ OUString IndexTabPage_Impl::GetSelectEntry() const } - void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword ) { sKeyword = rKeyword; @@ -819,7 +808,6 @@ void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword ) } - bool IndexTabPage_Impl::HasKeyword() const { bool bRet = false; @@ -833,7 +821,6 @@ bool IndexTabPage_Impl::HasKeyword() const } - bool IndexTabPage_Impl::HasKeywordIgnoreCase() { bool bRet = false; @@ -857,7 +844,6 @@ bool IndexTabPage_Impl::HasKeywordIgnoreCase() } - void IndexTabPage_Impl::OpenKeyword() { if ( !sKeyword.isEmpty() ) @@ -894,7 +880,6 @@ bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) } - void SearchBox_Impl::Select() { if ( !IsTravelSelect() ) @@ -1012,7 +997,6 @@ void SearchTabPage_Impl::dispose() } - void SearchTabPage_Impl::ClearSearchResults() { const sal_Int32 nCount = m_pResultsLB->GetEntryCount(); @@ -1023,7 +1007,6 @@ void SearchTabPage_Impl::ClearSearchResults() } - void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) { for ( sal_Int32 i = 0; i < m_pSearchED->GetEntryCount(); ++i ) @@ -1039,7 +1022,6 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) } - IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ClickHdl, Button*, void) { SearchHdl(nullptr); @@ -1111,7 +1093,6 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink ) } - OUString SearchTabPage_Impl::GetSelectEntry() const { OUString aRet; @@ -1122,7 +1103,6 @@ OUString SearchTabPage_Impl::GetSelectEntry() const } - void SearchTabPage_Impl::ClearPage() { ClearSearchResults(); @@ -1130,7 +1110,6 @@ void SearchTabPage_Impl::ClearPage() } - bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) { bool bRet = false; @@ -1204,7 +1183,6 @@ void BookmarksBox_Impl::dispose() } - void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) { switch ( nAction ) @@ -1255,7 +1233,6 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) } - bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bRet = false; @@ -1363,7 +1340,6 @@ OUString BookmarksTabPage_Impl::GetSelectEntry() const } - void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL ) { OUString aImageURL = IMAGE_URL; @@ -1471,7 +1447,6 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent) } - SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl() { disposeOnce(); @@ -1500,7 +1475,6 @@ void SfxHelpIndexWindow_Impl::dispose() } - void SfxHelpIndexWindow_Impl::Initialize() { OUStringBuffer aHelpURL(HELP_URL); @@ -1524,7 +1498,6 @@ void SfxHelpIndexWindow_Impl::Initialize() } - void SfxHelpIndexWindow_Impl::SetActiveFactory() { DBG_ASSERT( pIPage, "index page not initialized" ); @@ -1551,7 +1524,6 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory() } - HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId ) { rCurId = m_pTabCtrl->GetCurPageId(); @@ -1707,7 +1679,6 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt) } - void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -1721,7 +1692,6 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } - void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<Control*,bool>& rLink ) { aPageDoubleClickLink = rLink; @@ -1783,7 +1753,6 @@ void SfxHelpIndexWindow_Impl::AddBookmarks( const OUString& rTitle, const OUStri } - bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory ) { bool bValid = false; @@ -1800,7 +1769,6 @@ bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory ) } - void SfxHelpIndexWindow_Impl::ClearSearchPage() { if ( pSPage ) @@ -1954,7 +1922,6 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : } - SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl() { disposeOnce(); @@ -1975,7 +1942,6 @@ void SfxHelpTextWindow_Impl::dispose() } - bool SfxHelpTextWindow_Impl::HasSelection() const { // is there any selection in the text and not only a cursor? @@ -1992,7 +1958,6 @@ bool SfxHelpTextWindow_Impl::HasSelection() const } - void SfxHelpTextWindow_Impl::InitToolBoxImages() { bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); @@ -2036,7 +2001,6 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages() } - void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) { sCurrentFactory = SfxHelp::GetCurrentModuleIdentifier(); @@ -2130,7 +2094,6 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) } - void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition() { long nX = std::max( GetOutputSizePixel().Width() - aOnStartupCB->GetSizePixel().Width(), nMinPos ); @@ -2140,7 +2103,6 @@ void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition() } - Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator() { if ( !xBreakIterator.is() ) @@ -2150,7 +2112,6 @@ Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator() } - Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const { // return the current cursor @@ -2182,7 +2143,6 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const } - bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode ) { bool bRet = false; @@ -2204,7 +2164,6 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode ) } - IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) { try @@ -2245,7 +2204,6 @@ IMPL_LINK_NOARG_TYPED(SfxHelpTextWindow_Impl, SelectHdl, Idle *, void) } - IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) { InitToolBoxImages(); @@ -2254,7 +2212,6 @@ IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) } - IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, void ) { FindHdl(&rDlg); @@ -2340,14 +2297,12 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) } - IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, void ) { pSrchDlg.clear(); } - IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); @@ -2370,7 +2325,6 @@ IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) } - void SfxHelpTextWindow_Impl::Resize() { Size aSize = GetOutputSizePixel(); @@ -2381,7 +2335,6 @@ void SfxHelpTextWindow_Impl::Resize() } - bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { bool bDone = false; @@ -2507,7 +2460,6 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) } - void SfxHelpTextWindow_Impl::GetFocus() { if ( !bIsInClose ) @@ -2529,7 +2481,6 @@ void SfxHelpTextWindow_Impl::GetFocus() } - void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -2544,7 +2495,6 @@ void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } - void SfxHelpTextWindow_Impl::ToggleIndex( bool bOn ) { bIsIndexOn = bOn; @@ -2561,7 +2511,6 @@ void SfxHelpTextWindow_Impl::ToggleIndex( bool bOn ) } - void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch ) { aSearchText = rSearchText; @@ -2570,7 +2519,6 @@ void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, bool } - void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const { #ifdef DBG_UTIL @@ -2631,7 +2579,6 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const } - void SfxHelpTextWindow_Impl::CloseFrame() { bIsInClose = true; @@ -2647,7 +2594,6 @@ void SfxHelpTextWindow_Impl::CloseFrame() } - void SfxHelpTextWindow_Impl::DoSearch() { if ( !pSrchDlg ) @@ -2678,7 +2624,6 @@ void SfxHelpWindow_Impl::Resize() } - void SfxHelpWindow_Impl::Split() { static long nMinSplitSize = 5; @@ -2773,7 +2718,6 @@ void SfxHelpWindow_Impl::MakeLayout() } - void SfxHelpWindow_Impl::InitSizes() { if ( xWindow.is() ) @@ -2795,7 +2739,6 @@ void SfxHelpWindow_Impl::InitSizes() } - void SfxHelpWindow_Impl::LoadConfig() { SvtViewOptions aViewOpt( E_WINDOW, CONFIGNAME_HELPWIN ); @@ -2833,7 +2776,6 @@ void SfxHelpWindow_Impl::LoadConfig() } - void SfxHelpWindow_Impl::SaveConfig() { SvtViewOptions aViewOpt( E_WINDOW, CONFIGNAME_HELPWIN ); @@ -2866,7 +2808,6 @@ void SfxHelpWindow_Impl::SaveConfig() } - void SfxHelpWindow_Impl::ShowStartPage() { OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), @@ -2877,7 +2818,6 @@ void SfxHelpWindow_Impl::ShowStartPage() } - IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) { if ( pToolBox ) @@ -2888,7 +2828,6 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) } - IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) { pIndexWin->SelectExecutableEntry(); @@ -2930,7 +2869,6 @@ IMPL_LINK_NOARG_TYPED(SfxHelpWindow_Impl, OpenHdl, Control*, bool) } - IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin, void ) { if ( sTitle.isEmpty() ) @@ -2948,14 +2886,12 @@ IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* } - IMPL_LINK_TYPED( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl&, rListener, void ) { SetFactory( rListener.GetFactory() ); } - void SfxHelpWindow_Impl::openDone(const OUString& sURL , bool bSuccess) { @@ -3008,7 +2944,6 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , } - SfxHelpWindow_Impl::SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >& rFrame, vcl::Window* pParent, WinBits ) : @@ -3050,7 +2985,6 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( } - SfxHelpWindow_Impl::~SfxHelpWindow_Impl() { disposeOnce(); @@ -3101,7 +3035,6 @@ void SfxHelpWindow_Impl::SetFactory( const OUString& rFactory ) } - void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL ) { INetURLObject aObj( rURL ); @@ -3110,7 +3043,6 @@ void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL ) } - void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) { switch ( nActionId ) @@ -3211,7 +3143,6 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) } - void SfxHelpWindow_Impl::CloseWindow() { try @@ -3238,7 +3169,6 @@ void SfxHelpWindow_Impl::CloseWindow() } - void SfxHelpWindow_Impl::UpdateToolbox() { pTextWin->GetToolBox().EnableItem( TBI_BACKWARD, pHelpInterceptor->HasHistoryPred() ); @@ -3246,14 +3176,12 @@ void SfxHelpWindow_Impl::UpdateToolbox() } - bool SfxHelpWindow_Impl::HasHistoryPredecessor() const { return pHelpInterceptor->HasHistoryPred(); } - bool SfxHelpWindow_Impl::HasHistorySuccessor() const { return pHelpInterceptor->HasHistorySucc(); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index bd42619f9b72..a98514c1dce3 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -46,7 +46,6 @@ #include <sfx2/sfxresid.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; @@ -54,8 +53,6 @@ using namespace ::com::sun::star::uno; using namespace ::cppu; - - sal_uInt16 SvxOpenGrfErr2ResId( short err ) { switch( err ) diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 9e9b16400ec6..733686b65633 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -36,7 +36,6 @@ #include <cppuhelper/implbase.hxx> - #include <sfx2/app.hxx> #include "sfxpicklist.hxx" #include <sfx2/sfxuno.hxx> @@ -57,13 +56,11 @@ #include <algorithm> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - class StringLength : public ::cppu::WeakImplHelper< XStringWidth > { public: diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 1802938687ce..2313a32f337f 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -223,7 +223,6 @@ ShutdownIcon::~ShutdownIcon() } - void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const Sequence< PropertyValue >& aArgs ) { if ( getInstance() && getInstance()->m_xDesktop.is() ) @@ -256,7 +255,6 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const } - void ShutdownIcon::FileOpen() { if ( getInstance() && getInstance()->m_xDesktop.is() ) @@ -268,7 +266,6 @@ void ShutdownIcon::FileOpen() } - void ShutdownIcon::FromTemplate() { if ( getInstance() && getInstance()->m_xDesktop.is() ) @@ -324,7 +321,6 @@ OUString ShutdownIcon::GetResString( int id ) } - OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) { ::SolarMutexGuard aGuard; @@ -333,7 +329,6 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl ) } - void ShutdownIcon::StartFileDialog() { ::SolarMutexGuard aGuard; @@ -356,7 +351,6 @@ void ShutdownIcon::StartFileDialog() } - IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, void ) { DBG_ASSERT( m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" ); @@ -499,7 +493,6 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused } - void ShutdownIcon::addTerminateListener() { ShutdownIcon* pInst = getInstance(); @@ -518,7 +511,6 @@ void ShutdownIcon::addTerminateListener() } - void ShutdownIcon::terminateDesktop() { ShutdownIcon* pInst = getInstance(); @@ -543,7 +535,6 @@ void ShutdownIcon::terminateDesktop() } - ShutdownIcon* ShutdownIcon::getInstance() { OSL_ASSERT( pShutdownIcon ); @@ -551,7 +542,6 @@ ShutdownIcon* ShutdownIcon::getInstance() } - ShutdownIcon* ShutdownIcon::createInstance() { if (pShutdownIcon) @@ -584,7 +574,6 @@ void ShutdownIcon::init() throw( css::uno::Exception, std::exception ) } - void SAL_CALL ShutdownIcon::disposing() { m_xContext.clear(); @@ -594,7 +583,6 @@ void SAL_CALL ShutdownIcon::disposing() } - // XEventListener void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) @@ -602,7 +590,6 @@ void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& ) } - // XTerminateListener void SAL_CALL ShutdownIcon::queryTermination( const css::lang::EventObject& ) throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) @@ -615,16 +602,12 @@ throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exc } - - void SAL_CALL ShutdownIcon::notifyTermination( const css::lang::EventObject& ) throw(css::uno::RuntimeException, std::exception) { } - - void SAL_CALL ShutdownIcon::initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw( css::uno::Exception, std::exception ) { @@ -674,14 +657,12 @@ void SAL_CALL ShutdownIcon::initialize( const css::uno::Sequence< css::uno::Any> } - void ShutdownIcon::EnterModalMode() { bModalMode = true; } - void ShutdownIcon::LeaveModalMode() { bModalMode = false; @@ -705,7 +686,6 @@ bool ShutdownIcon::IsQuickstarterInstalled() #endif // !WNT - #if defined (ENABLE_QUICKSTART_APPLET) && defined (UNX) /** * Return the XDG autostart directory. diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index c0096912ed1f..34cfb292c831 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -89,7 +89,6 @@ typedef struct tagMYITEM } MYITEM; - static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw, const OUString& module ) { MENUITEMINFOW mi; @@ -134,7 +133,6 @@ static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text } - static HMENU createSystrayMenu( ) { SvtModuleOptions aModuleOptions; @@ -200,7 +198,6 @@ static HMENU createSystrayMenu( ) } - // insert the remaining menu entries addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE, pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true, ""); @@ -218,7 +215,6 @@ static HMENU createSystrayMenu( ) } - static void deleteSystrayMenu( HMENU hMenu ) { if( !hMenu || !IsMenu( hMenu )) @@ -243,7 +239,6 @@ static void deleteSystrayMenu( HMENU hMenu ) } - static void addTaskbarIcon( HWND hWnd ) { OUString strTip; @@ -268,7 +263,6 @@ static void addTaskbarIcon( HWND hWnd ) } - LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static UINT s_uTaskbarRestart = 0; @@ -387,7 +381,6 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP } - LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) @@ -445,8 +438,6 @@ LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP } - - DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ ) { osl_setThreadName("SystrayThread"); @@ -477,7 +468,6 @@ DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ ) } - void win32_init_sys_tray() { if ( ShutdownIcon::IsQuickstarterInstalled() ) @@ -534,7 +524,6 @@ void win32_init_sys_tray() } - void win32_shutdown_sys_tray() { if ( ShutdownIcon::IsQuickstarterInstalled() ) @@ -552,9 +541,6 @@ void win32_shutdown_sys_tray() } - - - void OnMeasureItem(HWND hwnd, LPMEASUREITEMSTRUCT lpmis) { MYITEM *pMyItem = (MYITEM *) lpmis->itemData; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index e1e7e1cd08fc..117b9f947076 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -476,7 +476,6 @@ void SfxWorkWindow::Sort_Impl() } - // constructor for workwin of a Frame SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster ) @@ -734,7 +733,6 @@ void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( bool bForce ) } - SvBorder SfxWorkWindow::Arrange_Impl() /* [Description] @@ -899,7 +897,6 @@ bool SfxWorkWindow::PrepareClose_Impl() } - SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus ) { @@ -922,7 +919,6 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow, } - void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow ) { @@ -948,7 +944,6 @@ void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow ) } - SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const { @@ -964,7 +959,6 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const } - void SfxWorkWindow::ShowChildren_Impl() { @@ -1035,7 +1029,6 @@ void SfxWorkWindow::ShowChildren_Impl() } - void SfxWorkWindow::HideChildren_Impl() { for ( sal_uInt16 nPos = aChildren.size(); nPos > 0; --nPos ) @@ -1057,7 +1050,6 @@ void SfxWorkWindow::HideChildren_Impl() } - void SfxWorkWindow::ResetObjectBars_Impl() { sal_uInt16 n; @@ -1122,7 +1114,6 @@ bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const } - bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const { switch( nUpdateMode ) @@ -1205,7 +1196,6 @@ Reference< css::task::XStatusIndicator > SfxWorkWindow::GetStatusIndicator() } - bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) { if ( pObjShell && pObjShell->GetMedium() ) @@ -1219,7 +1209,6 @@ bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) } - css::uno::Reference< css::frame::XFrame > SfxWorkWindow::GetFrameInterface() { css::uno::Reference< css::frame::XFrame > xFrame; @@ -1236,7 +1225,6 @@ css::uno::Reference< css::frame::XFrame > SfxWorkWindow::GetFrameInterface() } - void SfxWorkWindow::UpdateObjectBars_Impl() { // Lock SplitWindows (which means suppressing the Resize-Reaction of the @@ -1618,7 +1606,6 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId ) } - void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, SfxDockingConfig eConfig, sal_uInt16 nId) { @@ -1848,7 +1835,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, } - void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, bool bEnabled, sal_uInt16 nMode ) { sal_uInt16 nInter = (sal_uInt16) ( lId >> 16 ); @@ -2020,7 +2006,6 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, bool bSetFocus) } - bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId) { sal_uInt16 nCount = aChildWins.size(); @@ -2099,7 +2084,6 @@ bool SfxWorkWindow::IsFloating( sal_uInt16 nId ) } - bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) { SfxChildWin_Impl *pCW=nullptr; @@ -2125,7 +2109,6 @@ bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) } - void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus) { SfxChildWin_Impl *pCW=nullptr; @@ -2177,7 +2160,6 @@ void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus } - void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSetFocus) { sal_uInt16 nCount = aChildWins.size(); @@ -2265,7 +2247,6 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSe } - SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId) { sal_uInt16 nCount = aChildWins.size(); @@ -2282,7 +2263,6 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId) } - void SfxWorkWindow::ResetChildWindows_Impl() { for ( size_t n = 0; n < aChildWins.size(); ++n ) diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index c36de4977ac5..53bb6764d5d7 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -253,7 +253,6 @@ BitSet& BitSet::operator|=( sal_uInt16 nBit ) } - // determines if the bit is set (may be the only one) bool BitSet::Contains( sal_uInt16 nBit ) const diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 0c9d3dfab1ce..a3e01cae2474 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -180,20 +180,17 @@ const SfxFilter* SfxFilterContainer::GetAnyFilter( SfxFilterFlags nMust, SfxFilt } - SfxFilterContainer::SfxFilterContainer( const OUString& rName ) : pImpl( new SfxFilterContainer_Impl( rName ) ) { } - SfxFilterContainer::~SfxFilterContainer() { } - const OUString SfxFilterContainer::GetName() const { return pImpl->aName; @@ -253,8 +250,6 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const OUString& rNam } - - // Impl-Data is shared between all FilterMatchers of the same factory class SfxFilterMatcher_Impl { @@ -377,7 +372,6 @@ const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilter } - sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter**ppFilter, @@ -408,14 +402,12 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( } - sal_uInt32 SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont ); } - sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, bool /*bDefUI*/ ) const { const SfxFilter* pOldFilter = *ppFilter; @@ -850,7 +842,6 @@ IMPL_LINK_TYPED( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString, bool ) } - SfxFilterMatcherIter::SfxFilterMatcherIter( const SfxFilterMatcher& rMatcher, SfxFilterFlags nOrMaskP, SfxFilterFlags nAndMaskP ) @@ -863,7 +854,6 @@ SfxFilterMatcherIter::SfxFilterMatcherIter( } - const SfxFilter* SfxFilterMatcherIter::Find_Impl() { const SfxFilter* pFilter = nullptr; @@ -886,7 +876,6 @@ const SfxFilter* SfxFilterMatcherIter::First() } - const SfxFilter* SfxFilterMatcherIter::Next() { return Find_Impl(); diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index fb48980d4a7e..eeb981e38a3f 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -123,7 +123,6 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL ) } - std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUString& rURL ) { vector< OUString > aProperties; @@ -189,7 +188,6 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin } - OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL ) { OUStringBuffer aRet; @@ -221,7 +219,6 @@ OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL ) } - bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL ) { bool bRet = false; @@ -243,7 +240,6 @@ bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL ) } - sal_Int64 SfxContentHelper::GetSize( const OUString& rContent ) { sal_Int64 nSize = 0; diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 343d191eb722..5d3700abb547 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -72,7 +72,6 @@ struct SfxProgress_Impl }; - void SfxProgress_Impl::Enable_Impl( bool bEnable ) { SfxObjectShell* pDoc = bAllDocs ? nullptr : static_cast<SfxObjectShell*>(xObjSh); @@ -95,7 +94,6 @@ void SfxProgress_Impl::Enable_Impl( bool bEnable ) } - SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ ) : nMax(0) , nCreate(0) @@ -112,7 +110,6 @@ SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ ) } - SfxProgress::SfxProgress ( SfxObjectShell* pObjSh, /* The action is performed on the @@ -169,7 +166,6 @@ SfxProgress::SfxProgress } - SfxProgress::~SfxProgress() /* [Description] @@ -186,7 +182,6 @@ SfxProgress::~SfxProgress() } - void SfxProgress::Stop() /* [Description] @@ -315,7 +310,6 @@ bool SfxProgress::SetState } - void SfxProgress::Resume() /* [Description] @@ -361,7 +355,6 @@ void SfxProgress::Resume() } - void SfxProgress::Suspend() /* [Description] @@ -403,7 +396,6 @@ void SfxProgress::Suspend() } - void SfxProgress::UnLock() { if( pImp->pActiveProgress ) return; @@ -416,7 +408,6 @@ void SfxProgress::UnLock() } - void SfxProgress::Reschedule() /* [Description] @@ -439,7 +430,6 @@ void SfxProgress::Reschedule() } - SfxProgress* SfxProgress::GetActiveProgress ( SfxObjectShell* pDocSh /* the <SfxObjectShell>, which should be @@ -488,14 +478,12 @@ SfxProgress* SfxProgress::GetActiveProgress } - void SfxProgress::EnterLock() { SfxGetpApp()->Get_Impl()->nRescheduleLocks++; } - void SfxProgress::LeaveLock() { SfxAppData_Impl *pImp = SfxGetpApp()->Get_Impl(); diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx index efe4e88dd0cd..fd3774f00767 100644 --- a/sfx2/source/bastyp/sfxresid.cxx +++ b/sfx2/source/bastyp/sfxresid.cxx @@ -22,7 +22,6 @@ #include "tools/resmgr.hxx" - static ResMgr* pMgr=nullptr; SfxResId::SfxResId( sal_uInt16 nId ) : diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 7613a9ab41cb..babdcf471f4e 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -48,7 +48,6 @@ #include <com/sun/star/uno/Reference.hxx> - using namespace com::sun::star; SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl ) @@ -133,9 +132,6 @@ void SfxEventNamesItem::AddEvent( const OUString& rName, const OUString& rUIName } - - - uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) { /* diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 56418beba5ea..b74875595de8 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -353,7 +353,6 @@ void SfxBindings::DeleteControllers_Impl() } - void SfxBindings::HidePopups( bool bHide ) { // Hide SfxPopupWindows @@ -879,7 +878,6 @@ void SfxBindings::Invalidate } - bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt ) { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 9f2b6040824c..fb8e7bf8b21d 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -99,8 +99,6 @@ void SfxControllerItem::BindInternal_Impl( sal_uInt16 nNewId, SfxBindings *pBind } - - void SfxControllerItem::UnBind() /* [Description] @@ -124,7 +122,6 @@ void SfxControllerItem::UnBind() } - void SfxControllerItem::ReBind() /* [Description] @@ -147,7 +144,6 @@ void SfxControllerItem::ReBind() } - void SfxControllerItem::ClearCache() /* [Description] @@ -196,7 +192,6 @@ void SfxControllerItem::SetId( sal_uInt16 nItemId ) } - // creates a atomic item for a controller without registration. SfxControllerItem::SfxControllerItem(): @@ -262,7 +257,6 @@ void SfxControllerItem::StateChanged } - void SfxStatusForwarder::StateChanged ( sal_uInt16 nSID, // <SID> of the triggering slot @@ -275,7 +269,6 @@ void SfxStatusForwarder::StateChanged } - SfxStatusForwarder::SfxStatusForwarder( sal_uInt16 nSlotId, SfxControllerItem& rMaster ): @@ -285,7 +278,6 @@ SfxStatusForwarder::SfxStatusForwarder( } - SfxItemState SfxControllerItem::GetItemState ( const SfxPoolItem* pState /* Pointer to <SfxPoolItem>, which @@ -330,7 +322,6 @@ SfxItemState SfxControllerItem::GetItemState } - SfxMapUnit SfxControllerItem::GetCoreMetric() const /* [Description] diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx index 0c472e8f7953..093d1cfd35c2 100644 --- a/sfx2/source/control/minfitem.cxx +++ b/sfx2/source/control/minfitem.cxx @@ -24,7 +24,6 @@ SfxPoolItem* SfxMacroInfoItem::CreateDefault() { DBG_ASSERT(false, "No SfxMacroInfItem factory available"); return nullptr; } - SfxMacroInfoItem::SfxMacroInfoItem( sal_uInt16 nWhichId, // Slot-ID const BasicManager* pMgr, @@ -42,7 +41,6 @@ SfxMacroInfoItem::SfxMacroInfoItem( } - // copy constructor SfxMacroInfoItem::SfxMacroInfoItem(const SfxMacroInfoItem& rCopy): @@ -56,7 +54,6 @@ SfxMacroInfoItem::SfxMacroInfoItem(const SfxMacroInfoItem& rCopy): } - // op == bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const @@ -71,14 +68,12 @@ bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const } - SfxPoolItem *SfxMacroInfoItem::Clone( SfxItemPool *) const { return new SfxMacroInfoItem(*this); } - OUString SfxMacroInfoItem::GetQualifiedName() const { OUString aMacroName = aLibName; diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 574182c3cc98..e0a6d5efe69f 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -42,7 +42,6 @@ SfxSlotKind SfxSlot::GetKind() const } - sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const { if ( !nMasterSlotId || nMasterSlotId == USHRT_MAX ) diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index eafca7394d5e..70598d07004e 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -94,7 +94,6 @@ void SfxSlotPool::RegisterInterface( SfxInterface& rInterface ) } - const std::type_info* SfxSlotPool::GetSlotType( sal_uInt16 nId ) const { const SfxSlot* pSlot = (const_cast <SfxSlotPool*> (this))->GetSlot( nId ); @@ -137,7 +136,6 @@ const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId ) } - // skips to the next group OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo ) @@ -181,16 +179,12 @@ OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo ) } - - sal_uInt16 SfxSlotPool::GetGroupCount() { return _pGroups->size(); } - - // internal search loop const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface ) @@ -280,7 +274,6 @@ const SfxSlot* SfxSlotPool::NextSlot() } - // Query SlotName with help text @@ -293,8 +286,6 @@ SfxInterface* SfxSlotPool::FirstInterface() } - - const SfxSlot* SfxSlotPool::GetUnoSlot( const OUString& rName ) { const SfxSlot *pSlot = nullptr; diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 4794ff167f48..09132cfb94af 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -274,7 +274,6 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) } - SfxInterface::~SfxInterface() { SfxModule *pMod = pImpData->pModule; @@ -291,7 +290,6 @@ SfxInterface::~SfxInterface() } - // searches for the specified func const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const @@ -328,7 +326,6 @@ const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const } - const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const { @@ -347,7 +344,6 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const } - const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const { @@ -495,8 +491,6 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (sal_uInt16 nNo) const } - - sal_uInt16 SfxInterface::GetChildWindowCount() const { if (pGenoType) diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index aea4c8f01ff8..6279033435b1 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -204,7 +204,6 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem ) } - SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) { m_pSfxQueryStatusImpl = new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand ); diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 770d70d29dc8..9b6cc891beab 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -42,7 +42,6 @@ #include <rtl/strbuf.hxx> - using namespace ::com::sun::star; struct SfxRequest_Impl: public SfxListener @@ -94,8 +93,6 @@ struct SfxRequest_Impl: public SfxListener }; - - void SfxRequest_Impl::Notify( SfxBroadcaster&, const SfxHint &rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -104,7 +101,6 @@ void SfxRequest_Impl::Notify( SfxBroadcaster&, const SfxHint &rHint ) } - void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool ) { if ( pNewPool != pPool ) @@ -118,8 +114,6 @@ void SfxRequest_Impl::SetPool( SfxItemPool *pNewPool ) } - - SfxRequest::~SfxRequest() { // Leave out Done() marked requests with 'rem' @@ -134,7 +128,6 @@ SfxRequest::~SfxRequest() } - SfxRequest::SfxRequest ( const SfxRequest& rOrig @@ -164,7 +157,6 @@ SfxRequest::SfxRequest } - SfxRequest::SfxRequest ( SfxViewFrame* pViewFrame, @@ -210,8 +202,6 @@ SfxRequest::SfxRequest } - - SfxRequest::SfxRequest ( sal_uInt16 nSlotId, // executed <Slot-Id> @@ -256,7 +246,6 @@ SfxRequest::SfxRequest } - SfxRequest::SfxRequest ( sal_uInt16 nSlotId, @@ -286,14 +275,12 @@ SfxCallMode SfxRequest::GetCallMode() const } - bool SfxRequest::IsSynchronCall() const { return SfxCallMode::SYNCHRON == ( SfxCallMode::SYNCHRON & pImp->nCallMode ); } - void SfxRequest::SetSynchronCall( bool bSynchron ) { if ( bSynchron ) @@ -314,8 +301,6 @@ const SfxItemSet* SfxRequest::GetInternalArgs_Impl() const } - - void SfxRequest_Impl::Record ( const uno::Sequence < beans::PropertyValue >& rArgs // current Parameter @@ -372,7 +357,6 @@ void SfxRequest_Impl::Record } - void SfxRequest::Record_Impl ( SfxShell& rSh, // the <SfxShell>, which has executed the Request @@ -397,7 +381,6 @@ void SfxRequest::Record_Impl } - void SfxRequest::SetArgs( const SfxAllItemSet& rArgs ) { delete pArgs; @@ -406,7 +389,6 @@ void SfxRequest::SetArgs( const SfxAllItemSet& rArgs ) } - void SfxRequest::AppendItem(const SfxPoolItem &rItem) { if(!pArgs) @@ -415,7 +397,6 @@ void SfxRequest::AppendItem(const SfxPoolItem &rItem) } - void SfxRequest::RemoveItem( sal_uInt16 nID ) { if (pArgs) @@ -435,14 +416,12 @@ void SfxRequest::SetReturnValue(const SfxPoolItem &rItem) } - const SfxPoolItem* SfxRequest::GetReturnValue() const { return pImp->pRetVal; } - void SfxRequest::Done ( const SfxItemSet& rSet, /* parameters passed on by the application, @@ -503,8 +482,6 @@ void SfxRequest::Done } - - void SfxRequest::Done( bool bRelease ) // [<SfxRequest::Done(SfxItemSet&)>] { @@ -514,7 +491,6 @@ void SfxRequest::Done( bool bRelease ) } - void SfxRequest::ForgetAllArgs() { DELETEZ( pArgs ); @@ -522,14 +498,12 @@ void SfxRequest::ForgetAllArgs() } - bool SfxRequest::IsCancelled() const { return pImp->bCancelled; } - void SfxRequest::Cancel() /* [Description] @@ -545,8 +519,6 @@ void SfxRequest::Cancel() } - - void SfxRequest::Ignore() /* [Description] @@ -567,7 +539,6 @@ void SfxRequest::Ignore() } - void SfxRequest::Done_Impl ( const SfxItemSet* pSet /* parameters passed on by the application, @@ -682,7 +653,6 @@ void SfxRequest::Done_Impl } - bool SfxRequest::IsDone() const /* [Description] @@ -705,7 +675,6 @@ bool SfxRequest::IsDone() const } - css::uno::Reference< css::frame::XDispatchRecorder > SfxRequest::GetMacroRecorder( SfxViewFrame* pView ) /* [Description] @@ -742,8 +711,6 @@ bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView ) } - - bool SfxRequest::IsAPI() const /* [Description] @@ -769,7 +736,6 @@ sal_uInt16 SfxRequest::GetModifier() const } - void SfxRequest::AllowRecording( bool bSet ) { pImp->bAllowRecording = bSet; diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 8a202314decc..32cba4a8f346 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -36,7 +36,6 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() : } - SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) : SfxStringItem( rItem ), @@ -47,20 +46,17 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rI } - SfxScriptOrganizerItem::~SfxScriptOrganizerItem() { } - SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const { return new SfxScriptOrganizerItem( *this ); } - bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const { return typeid(rItem) == typeid(*this) && diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 91fcc92c8e6e..e549cd0ccc5b 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -324,8 +324,6 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons } - - // Set Status in all Controllers void SfxStateCache::SetState @@ -347,7 +345,6 @@ void SfxStateCache::SetState } - void SfxStateCache::SetVisibleState( bool bShow ) { if ( bShow != bItemVisible ) @@ -393,7 +390,6 @@ void SfxStateCache::SetVisibleState( bool bShow ) } - void SfxStateCache::SetState_Impl ( SfxItemState eState, // <SfxItemState> from 'pState' @@ -454,7 +450,6 @@ void SfxStateCache::SetState_Impl } - // Set old status again in all the controllers void SfxStateCache::SetCachedState( bool bAlways ) @@ -484,7 +479,6 @@ void SfxStateCache::SetCachedState( bool bAlways ) } - css::uno::Reference< css::frame::XDispatch > SfxStateCache::GetDispatch() const { if ( pDispatch ) diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 4a1663ee739c..a4b2af6031b8 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -155,13 +155,11 @@ BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext } - BackingComp::~BackingComp() { } - /** return information about supported interfaces. Some interfaces are supported by his class directly, but some other ones are @@ -215,7 +213,6 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type& } - /** increase ref count of this instance. */ @@ -226,7 +223,6 @@ void SAL_CALL BackingComp::acquire() } - /** decrease ref count of this instance. */ @@ -237,7 +233,6 @@ void SAL_CALL BackingComp::release() } - /** return collection about all supported interfaces. Optimize this method ! @@ -287,7 +282,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes() } - /** create one unique Id for all instances of this class. Optimize this method @@ -453,7 +447,6 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f } - /** not supported. This component does not know any model. It will be represented by a window and @@ -469,7 +462,6 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< cs } - /** not supported. This component does not know any model. It will be represented by a window and @@ -485,7 +477,6 @@ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel() } - /** not supported. return An empty value. @@ -498,7 +489,6 @@ css::uno::Any SAL_CALL BackingComp::getViewData() } - /** not supported. @param aData @@ -511,7 +501,6 @@ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& ) } - /** returns the attached frame for this component. @see attachFrame() @@ -530,7 +519,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame() } - /** ask controller for its current working state. If someone wishes to close this component, it must suspend the controller before. @@ -552,7 +540,6 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) } - /** callback from our window member. Our internal saved window wish to die. It will be disposed from outside (may be the frame) @@ -588,7 +575,6 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven } - /** kill this instance. It can be called from our owner frame only. But there is no possibility to check the calli. @@ -640,7 +626,6 @@ void SAL_CALL BackingComp::dispose() } - /** not supported. @param xListener @@ -660,7 +645,6 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c } - /** not supported. Because registration is not supported too, we must do nothing here. Nobody can call this method really. @@ -675,7 +659,6 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference } - /** force initialiation for this component. @@ -739,7 +722,6 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno } - /** */ @@ -749,7 +731,6 @@ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent& ) } - /** */ diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index cd86096f1416..851eb5430938 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -102,7 +102,6 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - void SfxModalDialog::SetDialogData_Impl() { // save settings (position and user data) @@ -123,7 +122,6 @@ void SfxModalDialog::SetDialogData_Impl() } - void SfxModalDialog::GetDialogData_Impl() /* [Description] @@ -188,7 +186,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool ) } - void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet ) { DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" ); @@ -375,7 +372,6 @@ void SfxModelessDialog::dispose() } - bool SfxModelessDialog::Close() /* [Description] @@ -396,7 +392,6 @@ bool SfxModelessDialog::Close() } - void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const /* [Description] @@ -415,7 +410,6 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const } - bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) /* [Description] @@ -511,7 +505,6 @@ bool SfxFloatingWindow::Close() } - SfxFloatingWindow::~SfxFloatingWindow() { disposeOnce(); @@ -603,7 +596,6 @@ void SfxFloatingWindow::Initialize(SfxChildWinInfo *pInfo) } - void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const /* [Description] @@ -679,7 +671,6 @@ IMPL_LINK_NOARG_TYPED(SfxSingleTabDialog, OKHdl_Impl, Button*, void) } - SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet, const OUString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 942f5cca9db7..6268e08e5d32 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -277,7 +277,6 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile, } - SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem ) : SfxStringItem( rItem ) , m_AutoloadDelay( rItem.getAutoloadDelay() ) @@ -440,7 +439,6 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( } - void SfxDocumentInfoItem::SetDeleteUserData( bool bSet ) { m_bDeleteUserData = bSet; @@ -1234,7 +1232,6 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, } - void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if ( m_nDocInfoId == nId ) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 99ab5232f06b..602ad99eed8b 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1774,7 +1774,6 @@ SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl() const } - void SfxDockingWindow::SetItemSize_Impl( const Size& rSize ) { pImp->aSplitSize = rSize; diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 61af42268231..0783116c4cd1 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -119,8 +119,6 @@ namespace sfx2 */ - - typedef StringPair FilterDescriptor; // a single filter or a filter class (display name and filter mask) typedef ::std::list< FilterDescriptor > FilterGroup; // a list of single filter entries typedef ::std::list< FilterGroup > GroupedFilterList; // a list of all filters, already grouped @@ -149,7 +147,6 @@ namespace sfx2 // = reading of configuration data - void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, FilterClass& /* [out] */ _rClass ) { @@ -337,7 +334,6 @@ namespace sfx2 // = grouping and classifying - // a struct which adds helps remembering a reference to a class entry struct ReferToFilterEntry : public ::std::unary_function< FilterName, void > { @@ -762,7 +758,6 @@ namespace sfx2 // = handling for the "all files" entry - bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) { bool bHasAll = false; @@ -799,7 +794,6 @@ namespace sfx2 // = filling an XFilterManager - struct AppendFilterGroup : public ::std::unary_function< FilterGroup, void > { protected: @@ -1190,5 +1184,4 @@ namespace sfx2 } // namespace sfx2 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index 54446c61d5dc..ae6fedd0c0e6 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -38,7 +38,6 @@ TriState lclConvertToTriState( bool bKnown, bool bIsKnownFlag, bool bIsUnknownFl } // namespace - sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot ) { return rItemSet.GetPool()->GetWhich( nSlot ); @@ -103,7 +102,6 @@ void DummyWindowWrapper::SetControlValue( void* ) } - CheckBoxWrapper::CheckBoxWrapper( CheckBox& rCheckBox ) : SingleControlWrapperType( rCheckBox ) { @@ -131,7 +129,6 @@ void CheckBoxWrapper::SetControlValue( bool bValue ) } - ColorListBoxWrapper::ColorListBoxWrapper(ColorListBox & rListBox): SingleControlWrapper< ColorListBox, Color >(rListBox) {} @@ -323,7 +320,6 @@ bool ItemConnectionArrayImpl::FillItemSet( SfxItemSet& rDestSet, const SfxItemSe } - ItemConnectionArray::ItemConnectionArray() : mxImpl( new ItemConnectionArrayImpl ) { @@ -354,7 +350,6 @@ bool ItemConnectionArray::FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& r } - } // namespace sfx /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 0c69f24a4ac7..a5fbf5cdd09d 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -248,7 +248,6 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx } - SfxManageStyleSheetPage::~SfxManageStyleSheetPage() { disposeOnce(); @@ -277,7 +276,6 @@ void SfxManageStyleSheetPage::dispose() } - void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, const OUString& rNew ) @@ -305,7 +303,6 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, } - void SfxManageStyleSheetPage::SetDescriptionText_Impl() /* [Description] @@ -488,7 +485,6 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet ) } - void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) /* [Description] @@ -557,7 +553,6 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) } - VclPtr<SfxTabPage> SfxManageStyleSheetPage::Create( vcl::Window* pParent, const SfxItemSet *rAttrSet ) { @@ -565,7 +560,6 @@ VclPtr<SfxTabPage> SfxManageStyleSheetPage::Create( vcl::Window* pParent, } - void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) /* [Description] @@ -596,7 +590,6 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet) } - SfxTabPage::sfxpg SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) /* [Description] diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index e6ea5936fa8c..27f204014fb0 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -139,7 +139,6 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl } - void SfxPartDockWnd_Impl::Resize() /* [Description] @@ -152,7 +151,6 @@ void SfxPartDockWnd_Impl::Resize() } - bool SfxPartDockWnd_Impl::QueryClose() { bool bClose = true; @@ -172,7 +170,6 @@ bool SfxPartDockWnd_Impl::QueryClose() } - bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) { if( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 0bc687c7842e..9aff690b72ac 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -28,7 +28,6 @@ #include "dialog.hrc" - IMPL_LINK_TYPED( SfxPasswordDialog, EditModifyHdl, Edit&, rEdit, void ) { ModifyHdl(&rEdit); @@ -167,7 +166,6 @@ void SfxPasswordDialog::SetPasswdText( ) } - void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen ) { mnMinLen = nLen; @@ -181,7 +179,6 @@ void SfxPasswordDialog::ShowMinLengthText(bool bShow) } - short SfxPasswordDialog::Execute() { mpUserFT->Hide(); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 29ff9e2a551c..23a9fd3f5d79 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star; - namespace { enum RedliningMode { RL_NONE, RL_WRITER, RL_CALC }; @@ -429,7 +428,6 @@ SfxSecurityPage::SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& rItemS } - bool SfxSecurityPage::FillItemSet( SfxItemSet * rItemSet ) { bool bModified = false; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 16e5a5b48300..701bc9ac3bd6 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -174,7 +174,6 @@ void SfxEmptySplitWin_Impl::FadeIn() } - void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.GetClicks() != 2 ) @@ -187,7 +186,6 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) } - SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) @@ -301,7 +299,6 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, } - SfxSplitWindow::~SfxSplitWindow() { disposeOnce(); @@ -364,7 +361,6 @@ void SfxSplitWindow::SaveConfig_Impl() } - void SfxSplitWindow::StartSplit() { long nSize = 0; @@ -393,7 +389,6 @@ void SfxSplitWindow::StartSplit() } - void SfxSplitWindow::SplitResize() { if ( bPinned ) @@ -406,7 +401,6 @@ void SfxSplitWindow::SplitResize() } - void SfxSplitWindow::Split() { if ( pEmptyWin ) @@ -458,7 +452,6 @@ void SfxSplitWindow::Split() } - void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize) /* @@ -550,7 +543,6 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize } - void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, bool bSave) { // The docking window is no longer stored in the internal data. @@ -574,7 +566,6 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, bool bSave) } - void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) @@ -598,7 +589,6 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, } - void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) @@ -668,7 +658,6 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize } - void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) @@ -800,7 +789,6 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, } - void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, bool bHide ) /* [Description] @@ -863,7 +851,6 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, bool bHide ) }; - bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, sal_uInt16& rLine, sal_uInt16& rPos ) const /* [Description] @@ -883,7 +870,6 @@ bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, } - bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, sal_uInt16& rLine, sal_uInt16& rPos ) const /* [Description] @@ -904,7 +890,6 @@ bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, } - sal_uInt16 SfxSplitWindow::GetLineCount() const /* [Description] @@ -916,7 +901,6 @@ sal_uInt16 SfxSplitWindow::GetLineCount() const } - long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const /* [Description] @@ -929,7 +913,6 @@ long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const } - sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const /* [Description] @@ -942,7 +925,6 @@ sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const } - sal_uInt16 SfxSplitWindow::GetWindowCount() const /* [Description] @@ -954,14 +936,12 @@ sal_uInt16 SfxSplitWindow::GetWindowCount() const } - void SfxSplitWindow::Command( const CommandEvent& rCEvt ) { SplitWindow::Command( rCEvt ); } - IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer ) @@ -1032,7 +1012,6 @@ IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) } - bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const { bool bVisible = IsVisible(); @@ -1073,7 +1052,6 @@ bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const } - SplitWindow* SfxSplitWindow::GetSplitWindow() { if ( !bPinned || !pEmptyWin->bFadeIn ) @@ -1093,7 +1071,6 @@ bool SfxSplitWindow::IsAutoHide( bool bSelf ) const } - void SfxSplitWindow::SetPinned_Impl( bool bOn ) { if ( bPinned == bOn ) @@ -1148,7 +1125,6 @@ void SfxSplitWindow::SetPinned_Impl( bool bOn ) } - void SfxSplitWindow::SetFadeIn_Impl( bool bOn ) { if ( bOn == pEmptyWin->bFadeIn ) diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index d0e953011f98..c3aad423cf7f 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; - namespace sfx2 { #define MAX_SAVE_COUNT (sal_uInt16)10 @@ -177,9 +176,7 @@ void SearchDialog::Move() } - } // namespace sfx2 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx index d98a47422361..8a42539d8557 100644 --- a/sfx2/source/dialog/styfitem.cxx +++ b/sfx2/source/dialog/styfitem.cxx @@ -80,7 +80,6 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) : } - // Destructor; releases the internal data SfxStyleFamilyItem::~SfxStyleFamilyItem() @@ -91,7 +90,6 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem() } - // Implementation of the resource constructor SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) : @@ -112,7 +110,6 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) : } - // Destructor; releases the internal data SfxStyleFamilies::~SfxStyleFamilies() diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index d53e8e0d8692..9b6ed2741b28 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -69,7 +69,6 @@ SfxStyleDialog::SfxStyleDialog } - SfxStyleDialog::~SfxStyleDialog() { disposeOnce(); @@ -89,7 +88,6 @@ void SfxStyleDialog::dispose() } - void SfxStyleDialog::RefreshInputSet() /* [Description] @@ -103,7 +101,6 @@ void SfxStyleDialog::RefreshInputSet() } - short SfxStyleDialog::Ok() /* [Description] @@ -117,7 +114,6 @@ short SfxStyleDialog::Ok() } - IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void ) /* [Description] diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 795b7015c298..6287c347a9ff 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -224,7 +224,6 @@ SfxTabPage::sfxpg SfxTabPage::DeactivatePage( SfxItemSet* ) } - void SfxTabPage::FillUserData() /* [Description] @@ -238,14 +237,12 @@ void SfxTabPage::FillUserData() } - bool SfxTabPage::IsReadOnly() const { return false; } - const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep ) /* [Description] @@ -266,7 +263,6 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot } - const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep ) @@ -310,7 +306,6 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const } - SfxTabDialog::SfxTabDialog /* [Description] @@ -338,7 +333,6 @@ SfxTabDialog::SfxTabDialog } - SfxTabDialog::~SfxTabDialog() { disposeOnce(); @@ -517,7 +511,6 @@ short SfxTabDialog::Execute() } - void SfxTabDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) { if ( !m_pTabCtrl->GetPageCount() ) @@ -527,7 +520,6 @@ void SfxTabDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) } - void SfxTabDialog::Start( bool bShow ) { pImpl->bModal = false; @@ -541,7 +533,6 @@ void SfxTabDialog::Start( bool bShow ) } - void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl) { DBG_ASSERT( m_pApplyBtn, "SfxTabDialog::GetApplyHandler: no apply button enabled!" ); @@ -550,7 +541,6 @@ void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl) } - void SfxTabDialog::Start_Impl() { assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount() @@ -631,7 +621,6 @@ sal_uInt16 SfxTabDialog::AddTabPage } - void SfxTabDialog::AddTabPage /* [Description] @@ -709,7 +698,6 @@ void SfxTabDialog::RemoveTabPage(const OString &rName) } - void SfxTabDialog::PageCreated /* [Description] @@ -727,7 +715,6 @@ void SfxTabDialog::PageCreated } - SfxItemSet* SfxTabDialog::GetInputSetImpl() /* [Description] @@ -741,7 +728,6 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl() } - SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const /* [Description] @@ -768,7 +754,6 @@ void SfxTabDialog::SavePosAndId() } - short SfxTabDialog::Ok() /* [Description] @@ -841,7 +826,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, CancelHdl, Button*, void) } - SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 ) /* [Description] @@ -856,7 +840,6 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 ) } - void SfxTabDialog::RefreshInputSet() /* [Description] @@ -871,7 +854,6 @@ void SfxTabDialog::RefreshInputSet() } - IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) /* [Description] @@ -915,7 +897,6 @@ bool SfxTabDialog::Apply() } - bool SfxTabDialog::PrepareLeaveCurrentPage() { sal_uInt16 const nId = m_pTabCtrl->GetCurPageId(); @@ -950,8 +931,6 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() } - - IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) /* [Description] @@ -976,7 +955,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) /* [Description] @@ -1002,7 +980,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) /* [Description] @@ -1079,7 +1056,6 @@ IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) } - IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) /* [Description] @@ -1183,7 +1159,6 @@ IMPL_LINK_TYPED( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) } - IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) /* [Description] @@ -1269,7 +1244,6 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) } - void SfxTabDialog::ShowPage( sal_uInt16 nId ) /* [Description] @@ -1283,7 +1257,6 @@ void SfxTabDialog::ShowPage( sal_uInt16 nId ) } - const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) /* [Description] @@ -1351,7 +1324,6 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool ) } - void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet ) /* [Description] diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index aafe9c7ddd5f..85eba32fde0b 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -181,7 +181,6 @@ static sal_uInt16 nLastItemId = USHRT_MAX; #define MAX_FILTER_ENTRIES 14 - class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable { typedef void (DeletionWatcher::* bool_type)(); @@ -576,7 +575,6 @@ void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos) } - StyleTreeArr_Impl& MakeTree_Impl(StyleTreeArr_Impl& rArr) { const sal_uInt16 nCount = rArr.size(); diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index b8ca54f7c5f6..0a4ce96f0c6b 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -43,7 +43,6 @@ SfxTemplateItem::SfxTemplateItem } - // copy constuctor SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) : @@ -54,7 +53,6 @@ SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) : } - // op == bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const @@ -64,7 +62,6 @@ bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const } - SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const { return new SfxTemplateItem(*this); @@ -98,7 +95,6 @@ bool SfxTemplateItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId } - sal_uInt8 SfxTemplateItem::GetFlagCount() const { return sizeof(sal_uInt16) * 8; diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index eecca2634303..95ff89ee0d30 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -766,7 +766,6 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl) } - DocumentMetadataAccess::DocumentMetadataAccess( uno::Reference< uno::XComponentContext > const & i_xContext, const IXmlIdRegistrySupplier & i_rRegistrySupplier) diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index f64da90a2146..229659b050f6 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -124,7 +124,6 @@ static bool isStylesFile (OUString const & i_rPath) } - // XML ID handling --------------------------------------------------- /** handles registration of XMetadatable. @@ -342,7 +341,6 @@ private: }; - // XmlIdRegistry ::sfx2::IXmlIdRegistry * createXmlIdRegistry(const bool i_DocIsClipboard) @@ -477,7 +475,6 @@ struct XmlIdRegistryDocument::XmlIdRegistry_Impl }; - static void rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter, OUString const & i_rStream, Metadatable const& i_rObject) @@ -495,7 +492,6 @@ rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter, } - const XmlIdList_t * XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElementList( const OUString & i_rStreamName, @@ -793,7 +789,6 @@ void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject) } - void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource, Metadatable & i_rCopy, const bool i_bCopyPrecedesSource) { @@ -892,7 +887,6 @@ XmlIdRegistryDocument::JoinMetadatables( } - // Clipboard XML ID Registry (_Impl) struct RMapEntry @@ -952,7 +946,6 @@ struct XmlIdRegistryClipboard::XmlIdRegistry_Impl }; - static void rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap, ClipboardXmlIdMap_t::iterator const& i_rIter, @@ -974,7 +967,6 @@ rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap, } - Metadatable* const* XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry( const OUString & i_rStreamName, @@ -1219,7 +1211,6 @@ void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject) } - std::shared_ptr<MetadatableClipboard> XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent) { @@ -1278,7 +1269,6 @@ XmlIdRegistryClipboard::SourceLink(Metadatable const& i_rObject) } - // Metadatable mixin @@ -1558,7 +1548,6 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther, } - // XMetadatable mixin // css::rdf::XNode: @@ -1650,8 +1639,6 @@ throw (uno::RuntimeException, std::exception) } // namespace sfx2 - - #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 95e8ecd9b894..27d1829d9625 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -1347,7 +1347,6 @@ void SAL_CALL SfxDocumentMetaData::init( } - SfxDocumentMetaData::SfxDocumentMetaData( css::uno::Reference< css::uno::XComponentContext > const & context) : BaseMutex() diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index d5328f0ff84d..dafa0d53f20b 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star; - typedef std::vector<SfxViewFactory*> SfxViewFactoryArr_Impl; struct SfxObjectFactory_Impl @@ -75,14 +74,12 @@ struct SfxObjectFactory_Impl }; - SfxFilterContainer* SfxObjectFactory::GetFilterContainer( bool /*bForceLoad*/ ) const { return pImpl->pFilterContainer; } - SfxObjectFactory::SfxObjectFactory ( const SvGlobalName& rName, @@ -114,7 +111,6 @@ SfxObjectFactory::SfxObjectFactory } - SfxObjectFactory::~SfxObjectFactory() { delete pImpl->pNameResId; @@ -122,7 +118,6 @@ SfxObjectFactory::~SfxObjectFactory() } - void SfxObjectFactory::RegisterViewFactory ( SfxViewFactory &rFactory @@ -152,21 +147,18 @@ void SfxObjectFactory::RegisterViewFactory } - sal_uInt16 SfxObjectFactory::GetViewFactoryCount() const { return pImpl->aViewFactoryArr.size(); } - SfxViewFactory& SfxObjectFactory::GetViewFactory(sal_uInt16 i) const { return *pImpl->aViewFactoryArr[i]; } - SfxModule* SfxObjectFactory::GetModule() const { return pImpl->pModule; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 9d2cb4eff874..3a9cd1805809 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2234,7 +2234,6 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont } - void SfxMedium::DoBackup_Impl() { // source file name is the logical name of this medium @@ -2633,14 +2632,12 @@ SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl) } - void SfxMedium::UseInteractionHandler( bool bUse ) { pImp->bAllowDefaultIntHdl = bUse; } - css::uno::Reference< css::task::XInteractionHandler > SfxMedium::GetInteractionHandler( bool bGetAlways ) { @@ -2673,7 +2670,6 @@ SfxMedium::GetInteractionHandler( bool bGetAlways ) } - void SfxMedium::SetFilter( const SfxFilter* pFilterP, bool /*bResetOrig*/ ) { pImp->m_pFilter = pFilterP; @@ -2685,14 +2681,12 @@ const SfxFilter* SfxMedium::GetFilter() const } - const SfxFilter* SfxMedium::GetOrigFilter( bool bNotCurrent ) const { return ( pImp->pOrigFilter || bNotCurrent ) ? pImp->pOrigFilter : pImp->m_pFilter; } - sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter ) { sal_uInt32 nHash = 0; @@ -2714,7 +2708,6 @@ sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, bool } - void SfxMedium::Close() { if ( pImp->xStorage.is() ) @@ -2855,7 +2848,6 @@ void SfxMedium::CloseStreams_Impl() } - void SfxMedium::SetIsRemote_Impl() { INetURLObject aObj( GetName() ); @@ -2878,7 +2870,6 @@ void SfxMedium::SetIsRemote_Impl() } - void SfxMedium::SetName( const OUString& aNameP, bool bSetOrigURL ) { if (pImp->aOrigURL.isEmpty()) @@ -2898,7 +2889,6 @@ const OUString& SfxMedium::GetOrigURL() const } - void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) { if ( rNameP != pImp->m_aName ) @@ -2919,7 +2909,6 @@ void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) } - void SfxMedium::ReOpen() { bool bUseInteractionHandler = pImp->bUseInteractionHandler; @@ -2929,7 +2918,6 @@ void SfxMedium::ReOpen() } - void SfxMedium::CompleteReOpen() { // do not use temporary file for reopen and in case of success throw the temporary file away @@ -3059,8 +3047,6 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : } - - SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const SfxItemSet* p ) : pImp(new SfxMedium_Impl) { @@ -3079,7 +3065,6 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS } - SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const OUString &rTypeName, const SfxItemSet* p ) : pImp(new SfxMedium_Impl) { @@ -3097,7 +3082,6 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS } - SfxMedium::~SfxMedium() { // if there is a requirement to clean the backup this is the last possibility to do it diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index d6b5c376bb6c..47a06d11c30e 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -98,14 +98,12 @@ using ::std::vector; using ::std::advance; - #define TITLE "Title" #define TARGET_URL "TargetURL" #define COMMAND_TRANSFER "transfer" - class RegionData_Impl; namespace DocTempl { @@ -147,7 +145,6 @@ public: using namespace ::DocTempl; - class RegionData_Impl { const SfxDocTemplate_Impl* mpParent; @@ -190,7 +187,6 @@ public: typedef vector< RegionData_Impl* > RegionList_Impl; - class SfxDocTemplate_Impl : public SvRefBase { uno::Reference< XPersist > mxInfo; @@ -241,7 +237,6 @@ public: }; - class DocTemplLocker_Impl { SfxDocTemplate_Impl& m_aDocTempl; @@ -259,7 +254,6 @@ public: }; - #ifndef SFX_DECL_DOCTEMPLATES_DEFINED #define SFX_DECL_DOCTEMPLATES_DEFINED typedef tools::SvRef<SfxDocTemplate_Impl> SfxDocTemplate_ImplRef; @@ -268,13 +262,11 @@ typedef tools::SvRef<SfxDocTemplate_Impl> SfxDocTemplate_ImplRef; SfxDocTemplate_Impl *gpTemplateData = nullptr; - static bool getTextProperty_Impl( Content& rContent, const OUString& rPropName, OUString& rPropValue ); - OUString SfxDocumentTemplates::GetFullRegionName ( sal_uInt16 nIdx // vcl::Region Index @@ -310,7 +302,6 @@ OUString SfxDocumentTemplates::GetFullRegionName } - const OUString& SfxDocumentTemplates::GetRegionName ( sal_uInt16 nIdx // vcl::Region Index @@ -346,7 +337,6 @@ const OUString& SfxDocumentTemplates::GetRegionName } - sal_uInt16 SfxDocumentTemplates::GetRegionCount() const /* [Description] @@ -369,7 +359,6 @@ sal_uInt16 SfxDocumentTemplates::GetRegionCount() const } - sal_uInt16 SfxDocumentTemplates::GetCount ( sal_uInt16 nRegion /* vcl::Region index whose number is @@ -400,7 +389,6 @@ sal_uInt16 SfxDocumentTemplates::GetCount } - const OUString& SfxDocumentTemplates::GetName ( sal_uInt16 nRegion, // vcl::Region Index, in which the entry lies @@ -441,7 +429,6 @@ const OUString& SfxDocumentTemplates::GetName } - OUString SfxDocumentTemplates::GetPath ( sal_uInt16 nRegion, // vcl::Region Index, in which the entry lies @@ -475,7 +462,6 @@ OUString SfxDocumentTemplates::GetPath } - OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString& aGroupName, const OUString& aTitle ) { @@ -506,7 +492,6 @@ OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString } - /** Convert a resource string - a template name - to its localised pair if it exists. @param nSourceResIds Resource ID where the list of original en-US template names begin. @@ -531,7 +516,6 @@ OUString SfxDocumentTemplates::ConvertResourceString ( } - bool SfxDocumentTemplates::CopyOrMove ( sal_uInt16 nTargetRegion, // Target vcl::Region Index @@ -637,7 +621,6 @@ bool SfxDocumentTemplates::CopyOrMove } - bool SfxDocumentTemplates::Move ( sal_uInt16 nTargetRegion, // Target vcl::Region Index @@ -667,7 +650,6 @@ bool SfxDocumentTemplates::Move } - bool SfxDocumentTemplates::Copy ( sal_uInt16 nTargetRegion, // Target vcl::Region Index @@ -698,7 +680,6 @@ bool SfxDocumentTemplates::Copy } - bool SfxDocumentTemplates::CopyTo ( sal_uInt16 nRegion, // vcl::Region of the template to be exported @@ -770,7 +751,6 @@ bool SfxDocumentTemplates::CopyTo } - bool SfxDocumentTemplates::CopyFrom ( sal_uInt16 nRegion, /* vcl::Region in which the template is to be @@ -914,7 +894,6 @@ bool SfxDocumentTemplates::CopyFrom } - bool SfxDocumentTemplates::Delete ( sal_uInt16 nRegion, // vcl::Region Index @@ -978,7 +957,6 @@ bool SfxDocumentTemplates::Delete } - bool SfxDocumentTemplates::InsertDir ( const OUString& rText, // the logical name of the new Region @@ -1098,7 +1076,6 @@ bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, s } - bool SfxDocumentTemplates::GetFull ( const OUString &rRegion, // vcl::Region Name @@ -1154,7 +1131,6 @@ bool SfxDocumentTemplates::GetFull } - bool SfxDocumentTemplates::GetLogicNames ( const OUString &rPath, // Full Path to the template @@ -1222,7 +1198,6 @@ bool SfxDocumentTemplates::GetLogicNames } - SfxDocumentTemplates::SfxDocumentTemplates() /* [Description] @@ -1237,7 +1212,6 @@ SfxDocumentTemplates::SfxDocumentTemplates() } - SfxDocumentTemplates::~SfxDocumentTemplates() /* [Description] @@ -1499,7 +1473,6 @@ int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const } - SfxDocTemplate_Impl::SfxDocTemplate_Impl() : mbConstructed( false ) , mnLockCounter( 0 ) @@ -1799,7 +1772,6 @@ bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL, } - void SfxDocTemplate_Impl::Clear() { ::osl::MutexGuard aGuard( maMutex ); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index aea2413dd083..824e53796b1b 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -142,7 +142,6 @@ public: #define Y_OFFSET 15 - struct NamePair_Impl { OUString maShortName; @@ -309,7 +308,6 @@ public: }; - class Updater_Impl : public ::osl::Thread { private: @@ -324,7 +322,6 @@ public: }; - class DocTemplates_EntryData_Impl { OUString maTitle; @@ -361,7 +358,6 @@ public: }; - class GroupData_Impl { vector< DocTemplates_EntryData_Impl* > maEntries; @@ -1347,7 +1343,6 @@ bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aU } - bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ) { @@ -2260,7 +2255,6 @@ SfxDocTplService::SfxDocTplService( const uno::Reference< XComponentContext >& x } - SfxDocTplService::~SfxDocTplService() { delete pImp; @@ -2277,7 +2271,6 @@ lang::Locale SAL_CALL SfxDocTplService::getLocale() } - void SAL_CALL SfxDocTplService::setLocale( const lang::Locale & rLocale ) throw( uno::RuntimeException, std::exception ) { @@ -2389,7 +2382,6 @@ void SAL_CALL SfxDocTplService::update() } - Updater_Impl::Updater_Impl( SfxDocTplService_Impl* pTemplates ) { mpDocTemplates = pTemplates; diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index e83c93102435..d65d970369b9 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -88,8 +88,6 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R } - - uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index f6ad2b4ca076..5289b2eb366f 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -186,14 +186,12 @@ bool SfxFrameDescriptorItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SfxFrameDescriptorItem::Clone( SfxItemPool* ) const { return new SfxFrameDescriptorItem( *this ); } - bool SfxFrameDescriptorItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index e1d4ec319992..1cc89742b928 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -530,7 +530,6 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter } - uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( SfxFilterFlags nMust, SfxFilterFlags nDont ) { uno::Sequence< beans::NamedValue > aSearchRequest { { "DocumentService", css::uno::makeAny(GetDocServiceName()) } }; @@ -1272,7 +1271,6 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con } - // class SfxStoringHelper diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 163899e73638..603de57c5be5 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -344,7 +344,6 @@ void SfxNewFileDialog_Impl::SetTemplateFlags(SfxTemplateFlags nSet) } - SfxNewFileDialog_Impl::SfxNewFileDialog_Impl( SfxNewFileDialog* pAntiImplP, sal_uInt16 nFl) : aNone(SfxResId(STR_NONE).toString()) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 7c620ced6ba9..67018f6b5c42 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -84,7 +84,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; - static bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight) { @@ -176,7 +175,6 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const } - void SfxObjectShell::UpdateDocInfoForSave() { uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties()); @@ -213,7 +211,6 @@ void SfxObjectShell::UpdateDocInfoForSave() } - static void lcl_add(util::Duration & rDur, tools::Time const& rTime) { @@ -285,7 +282,6 @@ void SfxObjectShell::UpdateTime_Impl( } - VclPtr<SfxDocumentInfoDialog> SfxObjectShell::CreateDocumentInfoDialog ( vcl::Window* pParent, @@ -296,8 +292,6 @@ VclPtr<SfxDocumentInfoDialog> SfxObjectShell::CreateDocumentInfoDialog } - - std::set<Color> SfxObjectShell::GetDocColors() { std::set<Color> empty; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 1e740d7cb0bc..dc279736d035 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -161,7 +161,6 @@ public: }; - sal_uInt16 const aTitleMap_Impl[3][2] = { // local remote @@ -171,21 +170,18 @@ sal_uInt16 const aTitleMap_Impl[3][2] = }; - void SfxObjectShell::AbortImport() { pImp->bIsAbortingImport = true; } - bool SfxObjectShell::IsAbortingImport() const { return pImp->bIsAbortingImport; } - uno::Reference<document::XDocumentProperties> SfxObjectShell::getDocProperties() { @@ -199,13 +195,11 @@ SfxObjectShell::getDocProperties() } - void SfxObjectShell::DoFlushDocInfo() { } - // Note: the only thing that calls this is the modification event handler // that is installed at the XDocumentProperties void SfxObjectShell::FlushDocInfo() @@ -223,7 +217,6 @@ void SfxObjectShell::FlushDocInfo() } - void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) { if(pImp->lErr==ERRCODE_NONE) @@ -236,14 +229,12 @@ void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) } - sal_uInt32 SfxObjectShell::GetError() const { return ERRCODE_TOERROR(GetErrorCode()); } - sal_uInt32 SfxObjectShell::GetErrorCode() const { sal_uInt32 lError=pImp->lErr; @@ -253,7 +244,6 @@ sal_uInt32 SfxObjectShell::GetErrorCode() const } - void SfxObjectShell::ResetError() { if( pImp->lErr != ERRCODE_NONE ) @@ -266,14 +256,12 @@ void SfxObjectShell::ResetError() } - bool SfxObjectShell::IsTemplate() const { return pImp->bIsTemplate; } - void SfxObjectShell::EnableSetModified( bool bEnable ) { #ifdef DBG_UTIL @@ -284,14 +272,12 @@ void SfxObjectShell::EnableSetModified( bool bEnable ) } - bool SfxObjectShell::IsEnableSetModified() const { return pImp->m_bEnableSetModified && !IsReadOnly(); } - bool SfxObjectShell::IsModified() { if ( pImp->m_bIsModified ) @@ -334,7 +320,6 @@ bool SfxObjectShell::IsModified() } - void SfxObjectShell::SetModified( bool bModifiedP ) { #ifdef DBG_UTIL @@ -353,7 +338,6 @@ void SfxObjectShell::SetModified( bool bModifiedP ) } - void SfxObjectShell::ModifyChanged() { if ( pImp->bClosing ) @@ -373,7 +357,6 @@ void SfxObjectShell::ModifyChanged() } - bool SfxObjectShell::IsReadOnlyUI() const /* [Description] @@ -387,7 +370,6 @@ bool SfxObjectShell::IsReadOnlyUI() const } - bool SfxObjectShell::IsReadOnlyMedium() const /* [Description] @@ -407,7 +389,6 @@ bool SfxObjectShell::IsOriginallyReadOnlyMedium() const } - void SfxObjectShell::SetReadOnlyUI( bool bReadOnly ) /* [Description] @@ -425,7 +406,6 @@ void SfxObjectShell::SetReadOnlyUI( bool bReadOnly ) } - void SfxObjectShell::SetReadOnly() { // Let the document be completely readonly, means that the @@ -458,7 +438,6 @@ bool SfxObjectShell::IsReadOnly() const } - bool SfxObjectShell::IsInModalMode() const { return pImp->bModalMode || pImp->bRunningMacro; @@ -470,7 +449,6 @@ bool SfxObjectShell::AcceptStateUpdate() const } - void SfxObjectShell::SetMacroMode_Impl( bool bModal ) { if ( !pImp->bRunningMacro != !bModal ) @@ -481,7 +459,6 @@ void SfxObjectShell::SetMacroMode_Impl( bool bModal ) } - void SfxObjectShell::SetModalMode_Impl( bool bModal ) { // Broadcast only if modified, or otherwise it will possibly go into @@ -617,7 +594,6 @@ bool SfxObjectShell::SwitchToShared( bool bShared, bool bSave ) } - void SfxObjectShell::FreeSharedFile() { if ( pMedium ) @@ -684,7 +660,6 @@ bool SfxObjectShell::IsDocShared() const } - OUString SfxObjectShell::GetSharedFileURL() const { #if HAVE_FEATURE_MULTIUSER_ENVIRONMENT @@ -700,8 +675,6 @@ Size SfxObjectShell::GetFirstPageSize() } - - IndexBitSet& SfxObjectShell::GetNoSet_Impl() { return pImp->aBitSet; @@ -752,7 +725,6 @@ void SfxObjectShell::SetTitle } - #if OSL_DEBUG_LEVEL > 1 OUString X(const OUString &rRet) { @@ -950,7 +922,6 @@ OUString SfxObjectShell::GetTitle } - void SfxObjectShell::InvalidateName() /* [Description] @@ -967,7 +938,6 @@ void SfxObjectShell::InvalidateName() } - void SfxObjectShell::SetNamedVisibility_Impl() { if ( !pImp->bIsNamedVisible ) @@ -990,14 +960,12 @@ void SfxObjectShell::SetNoName() } - SfxProgress* SfxObjectShell::GetProgress() const { return pImp->pProgress; } - void SfxObjectShell::SetProgress_Impl ( SfxProgress *pProgress /* to started <SfxProgress> or 0, @@ -1018,7 +986,6 @@ void SfxObjectShell::SetProgress_Impl } - void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) { SfxApplication* pSfxApp = SfxGetpApp(); @@ -1038,7 +1005,6 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) } - void SfxObjectShell::SetActivateEvent_Impl(sal_uInt16 nId ) { if ( GetFactory().GetFlags() & SfxObjectShellFlags::HASOPENDOC ) @@ -1379,7 +1345,6 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() } - void SfxObjectShell::PositionView_Impl() { MarkData_Impl *pMark = Get_Impl()->pMarkData; @@ -1395,7 +1360,6 @@ void SfxObjectShell::PositionView_Impl() } - bool SfxObjectShell::IsLoading() const /* [Description] @@ -1406,7 +1370,6 @@ bool SfxObjectShell::IsLoading() const } - void SfxObjectShell::CancelTransfers() /* [Description] @@ -1423,7 +1386,6 @@ void SfxObjectShell::CancelTransfers() } - AutoReloadTimer_Impl::AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ) : aUrl( rURL ), pObjSh( pSh ) @@ -1432,7 +1394,6 @@ AutoReloadTimer_Impl::AutoReloadTimer_Impl( } - void AutoReloadTimer_Impl::Invoke() { SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pObjSh ); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f7bc9b4858c9..aff63a7420a3 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -237,7 +237,6 @@ SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl() } - void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq) { SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this); @@ -249,7 +248,6 @@ void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq) } - void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet) { bool bPrinting = false; @@ -898,7 +896,6 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } - void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) { SfxWhichIter aIter( rSet ); @@ -1115,7 +1112,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) } - void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) { switch ( rReq.GetSlot() ) @@ -1157,7 +1153,6 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) } - void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet) { SfxWhichIter aIter(rSet); @@ -1234,7 +1229,6 @@ void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet) } - void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) { switch ( rReq.GetSlot() ) @@ -1271,7 +1265,6 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) } - void SfxObjectShell::StateView_Impl(SfxItemSet& /*rSet*/) { } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index a68a5851edd8..a83535738f4e 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1940,7 +1940,6 @@ bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) } - bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) { bool bOk = true; @@ -2481,7 +2480,6 @@ bool SfxObjectShell::ConvertTo } - bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) { SfxMedium* pRetrMedium = GetMedium(); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 0e341cdb23ce..f4fe0db8c0de 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -146,7 +146,6 @@ OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) } // namespace - class SfxModelListener_Impl : public ::cppu::WeakImplHelper< css::util::XCloseListener > { SfxObjectShell* mpDoc; @@ -202,7 +201,6 @@ void SAL_CALL SfxModelListener_Impl::disposing( const css::lang::EventObject& _r } - SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) :mpObjectContainer(nullptr) ,rDocShell( _rDocShell ) @@ -272,13 +270,11 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) } - SfxObjectShell_Impl::~SfxObjectShell_Impl() { } - SfxObjectShell::SfxObjectShell( const SfxModelFlags i_nCreationFlags ) : pImp(new SfxObjectShell_Impl(*this)) , pMedium(nullptr) @@ -380,21 +376,18 @@ SfxObjectShell::~SfxObjectShell() } - void SfxObjectShell::Stamp_SetPrintCancelState(bool bState) { pImp->bIsPrintJobCancelable = bState; } - bool SfxObjectShell::Stamp_GetPrintCancelState() const { return pImp->bIsPrintJobCancelable; } - // closes the Object and all its views bool SfxObjectShell::Close() @@ -524,7 +517,6 @@ SfxObjectShell* SfxObjectShell::GetNext } - SfxObjectShell* SfxObjectShell::Current() { SfxViewFrame *pFrame = SfxViewFrame::Current(); @@ -532,14 +524,12 @@ SfxObjectShell* SfxObjectShell::Current() } - bool SfxObjectShell::IsInPrepareClose() const { return pImp->bInPrepareClose; } - struct BoolEnv_Impl { SfxObjectShell_Impl* pImp; @@ -856,21 +846,18 @@ void SfxObjectShell::InitBasicManager_Impl() } - bool SfxObjectShell::DoClose() { return Close(); } - SfxObjectShell* SfxObjectShell::GetObjectShell() { return this; } - uno::Sequence< OUString > SfxObjectShell::GetEventNames() { static uno::Sequence< OUString >* pEventNameContainer = nullptr; @@ -889,7 +876,6 @@ uno::Sequence< OUString > SfxObjectShell::GetEventNames() } - css::uno::Reference< css::frame::XModel > SfxObjectShell::GetModel() const { return GetBaseModel(); @@ -906,7 +892,6 @@ void SfxObjectShell::SetBaseModel( SfxBaseModel* pModel ) } - css::uno::Reference< css::frame::XModel > SfxObjectShell::GetBaseModel() const { return pImp->pBaseModel.get(); diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 0d160dc86c62..ff3e23fb5f25 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -27,10 +27,6 @@ #include <rtl/strbuf.hxx> - - - - #define STREAM_BUFFER_SIZE 2048 // usings @@ -67,7 +63,6 @@ bool operator==(const util::Date &i_rLeft, const util::Date &i_rRight) } - /** Property representing a signed 32-bit integer value. */ class SfxOleInt32Property : public SfxOlePropertyBase { @@ -85,7 +80,6 @@ private: }; - /** Property representing a floating-point value. */ class SfxOleDoubleProperty : public SfxOlePropertyBase { @@ -103,7 +97,6 @@ private: }; - /** Property representing a boolean value. */ class SfxOleBoolProperty : public SfxOlePropertyBase { @@ -121,7 +114,6 @@ private: }; - /** Base class for properties that contain a single string value. */ class SfxOleStringPropertyBase : public SfxOlePropertyBase, public SfxOleStringHelper { @@ -144,7 +136,6 @@ private: }; - /** Property representing a bytestring value. */ class SfxOleString8Property : public SfxOleStringPropertyBase { @@ -161,7 +152,6 @@ private: }; - /** Property representing a Unicode string value. */ class SfxOleString16Property : public SfxOleStringPropertyBase { @@ -174,7 +164,6 @@ private: }; - /** Property representing a filetime value as defined by the Windows API. */ class SfxOleFileTimeProperty : public SfxOlePropertyBase { @@ -212,7 +201,6 @@ private: }; - /** Property representing a thumbnail picture. Currently, only saving this property is implemented. @@ -234,7 +222,6 @@ private: }; - /** Property representing a BLOB (which presumably stands for binary large object). @@ -256,7 +243,6 @@ private: }; - sal_uInt16 SfxOleTextEncoding::GetCodePage() const { sal_uInt16 nCodePage = IsUnicode() ? CODEPAGE_UNICODE : @@ -277,7 +263,6 @@ void SfxOleTextEncoding::SetCodePage( sal_uInt16 nCodePage ) } - OUString SfxOleStringHelper::LoadString8( SvStream& rStrm ) const { return IsUnicode() ? ImplLoadString16( rStrm ) : ImplLoadString8( rStrm ); @@ -378,7 +363,6 @@ void SfxOleStringHelper::ImplSaveString16( SvStream& rStrm, const OUString& rVal } - SfxOleObjectBase::~SfxOleObjectBase() { } @@ -410,7 +394,6 @@ void SfxOleObjectBase::SaveObject( SvStream& rStrm, SfxOleObjectBase& rObj ) } - SfxOleCodePageProperty::SfxOleCodePageProperty() : SfxOlePropertyBase( PROPID_CODEPAGE, PROPTYPE_INT16 ) { @@ -431,7 +414,6 @@ void SfxOleCodePageProperty::ImplSave( SvStream& rStrm ) } - SfxOleInt32Property::SfxOleInt32Property( sal_Int32 nPropId, sal_Int32 nValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_INT32 ), mnValue( nValue ) @@ -449,7 +431,6 @@ void SfxOleInt32Property::ImplSave( SvStream& rStrm ) } - SfxOleDoubleProperty::SfxOleDoubleProperty( sal_Int32 nPropId, double fValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_DOUBLE ), mfValue( fValue ) @@ -467,7 +448,6 @@ void SfxOleDoubleProperty::ImplSave( SvStream& rStrm ) } - SfxOleBoolProperty::SfxOleBoolProperty( sal_Int32 nPropId, bool bValue ) : SfxOlePropertyBase( nPropId, PROPTYPE_BOOL ), mbValue( bValue ) @@ -487,7 +467,6 @@ void SfxOleBoolProperty::ImplSave( SvStream& rStrm ) } - SfxOleStringPropertyBase::SfxOleStringPropertyBase( sal_Int32 nPropId, sal_Int32 nPropType, const SfxOleTextEncoding& rTextEnc ) : SfxOlePropertyBase( nPropId, nPropType ), @@ -511,7 +490,6 @@ SfxOleStringPropertyBase::SfxOleStringPropertyBase( } - SfxOleString8Property::SfxOleString8Property( sal_Int32 nPropId, const SfxOleTextEncoding& rTextEnc ) : SfxOleStringPropertyBase( nPropId, PROPTYPE_STRING8, rTextEnc ) @@ -535,7 +513,6 @@ void SfxOleString8Property::ImplSave( SvStream& rStrm ) } - SfxOleString16Property::SfxOleString16Property( sal_Int32 nPropId ) : SfxOleStringPropertyBase( nPropId, PROPTYPE_STRING16, RTL_TEXTENCODING_UCS2 ) { @@ -552,7 +529,6 @@ void SfxOleString16Property::ImplSave( SvStream& rStrm ) } - SfxOleFileTimeProperty::SfxOleFileTimeProperty( sal_Int32 nPropId ) : SfxOlePropertyBase( nPropId, PROPTYPE_FILETIME ) { @@ -637,7 +613,6 @@ void SfxOleDateProperty::ImplSave( SvStream& rStrm ) } - SfxOleThumbnailProperty::SfxOleThumbnailProperty( sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) : SfxOlePropertyBase( nPropId, PROPTYPE_CLIPFMT ), @@ -687,7 +662,6 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm ) } - SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) : SfxOlePropertyBase( nPropId, PROPTYPE_BLOB ), @@ -712,7 +686,6 @@ void SfxOleBlobProperty::ImplSave( SvStream& rStrm ) } - SfxOleDictionaryProperty::SfxOleDictionaryProperty( const SfxOleTextEncoding& rTextEnc ) : SfxOlePropertyBase( PROPID_DICTIONARY, 0 ), SfxOleStringHelper( rTextEnc ) @@ -759,7 +732,6 @@ void SfxOleDictionaryProperty::ImplSave( SvStream& rStrm ) } - SfxOleSection::SfxOleSection( bool bSupportsDict ) : maDictProp( maCodePageProp ), mnStartPos( 0 ), @@ -1145,7 +1117,6 @@ void SfxOleSection::SaveProperty( SvStream& rStrm, SfxOlePropertyBase& rProp, sa } - ErrCode SfxOlePropertySet::LoadPropertySet( SotStorage* pStrg, const OUString& rStrmName ) { if( pStrg ) @@ -1294,7 +1265,6 @@ const SvGlobalName& SfxOlePropertySet::GetSectionGuid( SfxOleSectionType eSectio } - //} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 3d1fa0c9f798..d0174b901df6 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -31,8 +31,6 @@ #include <com/sun/star/util/Date.hpp> - - //namespace { @@ -94,7 +92,6 @@ const sal_Int32 CLIPFMT_WIN = -1; const sal_Int32 CLIPDATAFMT_DIB = 8; - /** Helper for classes that need text encoding settings. Classes derived from this class will include functions to store and use @@ -131,7 +128,6 @@ private: }; - /** Helper for classes that need to load or save string values. Classes derived from this class contain functions to load and save string @@ -165,7 +161,6 @@ private: }; - /** Base class for all classes related to OLE property sets. Derived classes have to implement the pure virtual functions ImplLoad() and @@ -207,7 +202,6 @@ private: }; - /** Base class for all OLE property objects. */ class SfxOlePropertyBase : public SfxOleObjectBase { @@ -241,7 +235,6 @@ private: }; - /** Property containing custom names for other properties in the property set. */ class SfxOleDictionaryProperty : public SfxOlePropertyBase, public SfxOleStringHelper { @@ -268,7 +261,6 @@ private: }; - /** A section in a property set. Contains properties with unique identifiers. */ class SfxOleSection : public SfxOleObjectBase { @@ -356,7 +348,6 @@ private: typedef std::shared_ptr< SfxOleSection > SfxOleSectionRef; - /** Enumerates different section types in OLE property sets. */ enum SfxOleSectionType { @@ -366,7 +357,6 @@ enum SfxOleSectionType }; - /** Represents a complete property set, may consist of several property sections. */ class SfxOlePropertySet : public SfxOleObjectBase { diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 39593395f85a..067da16aa30c 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -580,8 +580,6 @@ class ImplUCBPrintWatcher : public ::osl::Thread }; - - // XPrintable void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& rOptions) diff --git a/sfx2/source/doc/syspathw32.cxx b/sfx2/source/doc/syspathw32.cxx index e673749c2161..422a0e0c2e89 100644 --- a/sfx2/source/doc/syspathw32.cxx +++ b/sfx2/source/doc/syspathw32.cxx @@ -18,7 +18,6 @@ */ - #ifdef WNT #ifdef _MSC_VER #pragma warning(disable:4917) diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 0217acdb51b4..da35e86a9ab2 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -27,7 +27,6 @@ #include <sfx2/sfx.hrc> - SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; } #define ZOOM_PARAM_VALUE "Value" @@ -36,7 +35,6 @@ SfxPoolItem* SvxZoomItem::CreateDefault() { return new SvxZoomItem; } #define ZOOM_PARAMS 3 - SvxZoomItem::SvxZoomItem ( SvxZoomType eZoomType, @@ -50,7 +48,6 @@ SvxZoomItem::SvxZoomItem } - SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ), nValueSet( rOrig.GetValueSet() ), @@ -59,20 +56,17 @@ SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig ) } - SvxZoomItem::~SvxZoomItem() { } - SfxPoolItem* SvxZoomItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomItem( *this ); } - SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const { sal_uInt16 nValue; @@ -85,7 +79,6 @@ SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) con } - SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { rStrm.WriteUInt16( GetValue() ) @@ -95,7 +88,6 @@ SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) con } - bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 1d8cf28a24c8..b9716e887570 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -52,9 +52,6 @@ public: }; - - - class CntItemPool: public SfxItemPool { static CntItemPool* _pThePool; @@ -70,8 +67,6 @@ public: }; - - // static SfxItemPool* NoChaos::GetItemPool() { diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 51797ccf71c0..2d3462ec96e6 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -49,7 +49,6 @@ class SfxObjectShell; class SvxMacro; - class SfxEvents_Impl : public ::cppu::WeakImplHelper< css::container::XNameReplace, css::document::XEventListener > { css::uno::Sequence< OUString > maEventNames; diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 487142bff140..b4a0f8dccb90 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -69,7 +69,6 @@ public: #endif - struct StringList_Impl : private Resource { diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index c9f4e907ea41..b7251f05c151 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -113,7 +113,6 @@ public: }; - // clears Cached-Item inline void SfxStateCache::ClearCache() @@ -122,7 +121,6 @@ inline void SfxStateCache::ClearCache() } - // registeres a item representing this function inline SfxControllerItem* SfxStateCache::ChangeItemLink( SfxControllerItem* pNewBinding ) diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 55334bfa0797..753d268160f4 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -162,7 +162,6 @@ enum class SfxDockingConfig #define SFX_SPLITWINDOWS_MAX 4 - class LayoutManagerListener : public ::cppu::WeakImplHelper< css::frame::XLayoutManagerListener, css::lang::XComponent > diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index a83e84b7f47d..31c4a02a4a04 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -76,7 +76,6 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const } - void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) const { OUString aName; @@ -132,7 +131,6 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) } - IMPL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); @@ -187,7 +185,6 @@ IMPL_LINK_NOARG_TYPED(SfxURLToolBoxControl_Impl, OpenHdl, SvtURLBox*, void) } - void SfxURLToolBoxControl_Impl::StateChanged ( sal_uInt16 nSID, diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index b871d7120069..8d62caf6e66b 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -66,7 +66,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - // binds the instance to the specified id and assignes the title void SfxMenuControl::Bind( @@ -89,8 +88,6 @@ void SfxMenuControl::Bind( } - - // binds the item to the specified menu and assignes the title void SfxMenuControl::Bind( @@ -108,7 +105,6 @@ void SfxMenuControl::Bind( } - // Constructor for explicit registration SfxMenuControl::SfxMenuControl( bool bShowStrings ) @@ -119,7 +115,6 @@ SfxMenuControl::SfxMenuControl( bool bShowStrings ) } - // Constructor for array SfxMenuControl::SfxMenuControl(): pOwnMenu(nullptr), @@ -129,7 +124,6 @@ SfxMenuControl::SfxMenuControl(): } - SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): SfxControllerItem(nSlotId, rBindings), pOwnMenu(nullptr), @@ -144,15 +138,12 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): } - - SfxMenuControl::~SfxMenuControl() { delete pSubMenu; } - // changes the state in the virtual menu void SfxMenuControl::StateChanged @@ -238,7 +229,6 @@ void SfxMenuControl::StateChanged } - SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ ) { return new SfxMenuControl( true ); @@ -290,7 +280,6 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB } - SfxUnoMenuControl* SfxMenuControl::CreateControl( const OUString& rCmd, sal_uInt16 nId, Menu& rMenu, const OUString& sItemText, SfxBindings& rBindings, SfxVirtualMenu* pVirt) diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index c4652799f02f..0741f4ec8b99 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -84,7 +84,6 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu ) } - SfxMenuManager::~SfxMenuManager() { pBindings->ENTERREGISTRATIONS(); @@ -93,7 +92,6 @@ SfxMenuManager::~SfxMenuManager() } - void SfxMenuManager::Construct( SfxVirtualMenu& rMenu ) { pMenu = &rMenu; @@ -209,7 +207,6 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) } - // executes the function for the selected item IMPL_LINK_TYPED( SfxMenuManager, Select, Menu *, pSelMenu, bool ) { @@ -248,7 +245,6 @@ SfxPopupMenuManager::~SfxPopupMenuManager() } - void SfxPopupMenuManager::RemoveDisabledEntries() { if ( pSVMenu ) @@ -265,7 +261,6 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, vcl::Window* pWindow } - SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) : pMenu(nullptr), pBindings(&rBindings) diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index 8bb0bdd009e0..f68533aabd88 100644 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -136,5 +136,4 @@ OUString SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) co } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index 08a0cd4ea891..6b5176163d06 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -55,7 +55,6 @@ public: }; - #endif diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index dc3b36f6da6c..d8a671beacb2 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -108,7 +108,6 @@ void SfxMenuImageControl_Impl::Update() } - static Image RetrieveAddOnImage( Reference< css::frame::XFrame >& rFrame, const OUString& aImageId, const OUString& aURL, @@ -132,7 +131,6 @@ static Image RetrieveAddOnImage( Reference< css::frame::XFrame >& rFrame, } - /* This helper function checks whether a Slot-id in the current application status is visible or not. This relates to the application status to see if the OLE server application exist or not. @@ -151,7 +149,6 @@ bool IsItemHidden_Impl( sal_uInt16 nItemId, bool bOleServer, bool bMac ) } - void SfxVirtualMenu::Construct_Impl() { pSVMenu->SetHighlightHdl( LINK(this, SfxVirtualMenu, Highlight) ); @@ -164,7 +161,6 @@ void SfxVirtualMenu::Construct_Impl() } - SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pOwnParent, Menu& rMenu, bool bWithHelp, SfxBindings &rBindings, bool bOLEServer, bool bRes, bool bIsAddonMenu ): @@ -195,7 +191,6 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, } - // creates a virtual menu from a StarView MenuBar or PopupMenu SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, bool bWithHelp, @@ -228,7 +223,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, bool bWithHelp, } - /* The destructor of the class SfxVirtualMenu releases bounded items and the associated StarView-PopupMenu is released from its parent. If it is related to the Pickmenu or the MDI-menu, it is unregistered here. @@ -480,7 +474,6 @@ void SfxVirtualMenu::CreateFromSVMenu() } - // called on activation of the SV-Menu IMPL_STATIC_LINK_NOARG_TYPED( @@ -555,7 +548,6 @@ IMPL_LINK_NOARG_TYPED(SfxVirtualMenu, SettingsChanged, LinkParamNone*, void) } - void SfxVirtualMenu::UpdateImages( Menu* pMenu ) { if ( !pMenu ) @@ -596,7 +588,6 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) } - void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu ) { if ( !pMenu ) @@ -615,7 +606,6 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu ) } - bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) { // Search , as SV with 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' always @@ -730,7 +720,6 @@ void SfxVirtualMenu::UnbindControllers() } - void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) { // Create special popup menu that is filled with the 3rd party components popup menu items @@ -769,7 +758,6 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) } - // called on activation of the SV-Menu IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool ) @@ -907,7 +895,6 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool ) } - IMPL_LINK_TYPED( SfxVirtualMenu, Deactivate, Menu *, pMenu, bool ) { SAL_INFO( @@ -976,12 +963,9 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Select, Menu *, pMenu, bool ) } - // returns the associated StarView-menu - - // set the checkmark of the specified item void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, bool bCheck ) @@ -1013,8 +997,6 @@ void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const OUString& rText ) } - - void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) { @@ -1029,7 +1011,6 @@ void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) } - // Forces the initialization, which is otherwise only happens in Activate void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, bool /*bOLE*/ ) diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 1ab6f74de212..f7b330cbfa17 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -48,7 +48,6 @@ #include <macroloader.hxx> - #define MACRO_PRFIX "macro://" #define MACRO_POSTFIX "()" @@ -315,7 +314,6 @@ void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) t } - SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell, uno::Reference< document::XEventBroadcaster > xBroadcaster ) { diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index beb29f7ba162..bef651eceade 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star; - sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ) { sal_uInt16 nVCLMouseButtons( 0 ); @@ -67,7 +66,6 @@ sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouse } - svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( const uno::Reference< frame::XFrame >& rFrame, StatusBar* pStatusBar, @@ -129,7 +127,6 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( } - SfxStatusBarControl::SfxStatusBarControl ( sal_uInt16 nSlotID, /* Slot-Id which is connected to this @@ -162,7 +159,6 @@ SfxStatusBarControl::SfxStatusBarControl } - SfxStatusBarControl::~SfxStatusBarControl() /* [Description] @@ -333,7 +329,6 @@ throw ( uno::RuntimeException, std::exception ) } - sal_Bool SAL_CALL SfxStatusBarControl::mouseMove( const awt::MouseEvent& rMouseEvent ) throw (uno::RuntimeException, std::exception) @@ -350,7 +345,6 @@ throw (uno::RuntimeException, std::exception) } - sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp( const ::awt::MouseEvent& rMouseEvent ) throw ( uno::RuntimeException, std::exception ) @@ -367,7 +361,6 @@ throw ( uno::RuntimeException, std::exception ) } - void SAL_CALL SfxStatusBarControl::command( const awt::Point& rPos, ::sal_Int32 nCommand, @@ -383,7 +376,6 @@ throw (css::uno::RuntimeException, std::exception) } - void SAL_CALL SfxStatusBarControl::paint( const uno::Reference< awt::XGraphics >& xGraphics, const awt::Rectangle& rOutputRectangle, @@ -402,7 +394,6 @@ throw ( ::uno::RuntimeException, std::exception ) } - void SAL_CALL SfxStatusBarControl::click( const awt::Point& ) throw ( uno::RuntimeException, std::exception ) { @@ -411,7 +402,6 @@ throw ( uno::RuntimeException, std::exception ) } - void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& ) throw ( uno::RuntimeException, std::exception ) { @@ -456,7 +446,6 @@ void SfxStatusBarControl::StateChanged } - bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) /* [Description] @@ -483,7 +472,6 @@ bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & ) } - bool SfxStatusBarControl::MouseMove( const MouseEvent & ) /* [Description] @@ -536,7 +524,6 @@ bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & ) } - void SfxStatusBarControl::Command( const CommandEvent& ) /* [Description] @@ -551,7 +538,6 @@ void SfxStatusBarControl::Command( const CommandEvent& ) } - void SfxStatusBarControl::Click() /* [Description] @@ -566,7 +552,6 @@ void SfxStatusBarControl::Click() } - void SfxStatusBarControl::Paint ( const UserDrawEvent& /* Reference to an UserDrawEvent */ @@ -586,7 +571,6 @@ void SfxStatusBarControl::Paint } - SfxStatusBarControl* SfxStatusBarControl::CreateControl ( sal_uInt16 nSlotID, diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index c04831ed15c7..a2d4a58aa0be 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -119,7 +119,6 @@ SfxImageManager_Impl::SfxImageManager_Impl(SfxModule& rModule) } - SfxImageManager_Impl::~SfxImageManager_Impl() { m_aOpt.RemoveListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) ); @@ -130,7 +129,6 @@ SfxImageManager_Impl::~SfxImageManager_Impl() } - ImageList* SfxImageManager_Impl::GetImageList( bool bBig ) { sal_Int32 nIndex = impl_convertBools( bBig ); @@ -143,7 +141,6 @@ ImageList* SfxImageManager_Impl::GetImageList( bool bBig ) } - Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig ) { ImageList* pImageList = GetImageList( bBig ); @@ -153,7 +150,6 @@ Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig ) } - void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) { SolarMutexGuard aGuard; @@ -199,14 +195,12 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) } - IMPL_LINK_NOARG_TYPED(SfxImageManager_Impl, OptionsChanged_Impl, LinkParamNone*, void) { SetSymbolsSize_Impl( m_aOpt.GetCurrentSymbolsSize() ); } - IMPL_LINK_TYPED( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) @@ -305,7 +299,6 @@ void SfxImageManager::RegisterToolBox( ToolBox *pBox, SfxToolboxFlags nFlags ) } - void SfxImageManager::ReleaseToolBox( ToolBox *pBox ) { SolarMutexGuard aGuard; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 08bd90474870..b8822e01b82e 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -103,7 +103,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::ui; - SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, true); static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) @@ -209,7 +208,6 @@ IMPL_LINK_TYPED( SfxToolBoxControl_Impl, WindowEventListener, VclWindowEvent&, r } - SfxToolBoxControl::SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nID, @@ -228,14 +226,12 @@ SfxToolBoxControl::SfxToolBoxControl( } - SfxToolBoxControl::~SfxToolBoxControl() { delete pImpl; } - ToolBox& SfxToolBoxControl::GetToolBox() const { return *pImpl->pBox; @@ -250,7 +246,6 @@ unsigned short SfxToolBoxControl::GetSlotId() const } - void SAL_CALL SfxToolBoxControl::dispose() throw (css::uno::RuntimeException, std::exception) { if ( m_bDisposed ) @@ -622,7 +617,6 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow ) } - IMPL_LINK_NOARG_TYPED(SfxToolBoxControl, PopupModeEndHdl, FloatingWindow*, void) { if ( pImpl->mpPopupWindow->IsVisible() ) @@ -654,7 +648,6 @@ IMPL_LINK_TYPED( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow, } - void SfxToolBoxControl::StateChanged ( sal_uInt16 nId, @@ -713,26 +706,22 @@ void SfxToolBoxControl::StateChanged } - void SfxToolBoxControl::Select( sal_uInt16 nSelectModifier ) { svt::ToolboxController::execute( nSelectModifier ); } - void SfxToolBoxControl::DoubleClick() { } - void SfxToolBoxControl::Click() { } - VclPtr<SfxPopupWindow> SfxToolBoxControl::CreatePopupWindow() { return nullptr; @@ -768,13 +757,11 @@ SfxFrameStatusListener::SfxFrameStatusListener( } - SfxFrameStatusListener::~SfxFrameStatusListener() { } - // XStatusListener void SAL_CALL SfxFrameStatusListener::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) @@ -997,7 +984,6 @@ SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener() } - void SfxPopupWindow::BindListener() { GetOrCreateStatusListener(); @@ -1006,7 +992,6 @@ void SfxPopupWindow::BindListener() } - void SfxPopupWindow::UnbindListener() { GetOrCreateStatusListener(); @@ -1015,7 +1000,6 @@ void SfxPopupWindow::UnbindListener() } - void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) { GetOrCreateStatusListener(); @@ -1024,7 +1008,6 @@ void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) } - bool SfxPopupWindow::Close() { m_bFloating = false; @@ -1035,7 +1018,6 @@ bool SfxPopupWindow::Close() } - void SfxPopupWindow::PopupModeEnd() { //! to allow PopupModeEndHdl to be called @@ -1052,7 +1034,6 @@ void SfxPopupWindow::PopupModeEnd() } - void SfxPopupWindow::DeleteFloatingWindow() { if ( m_bFloating ) @@ -1063,7 +1044,6 @@ void SfxPopupWindow::DeleteFloatingWindow() } - void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) { if ( !m_bCascading ) @@ -1089,14 +1069,12 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) } - void SfxPopupWindow::StartCascading() { m_bCascading = true; } - void SfxPopupWindow::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, @@ -1123,7 +1101,6 @@ void SfxPopupWindow::StateChanged( } - void SfxPopupWindow::Delete() { m_aDeleteLink.Call( this ); diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index ec677879ab1f..85f3c5a5cf9d 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -90,7 +90,6 @@ void SfxFrame::Construct_Impl() } - SfxFrame::~SfxFrame() { RemoveTopFrame_Impl( this ); @@ -236,7 +235,6 @@ bool SfxFrame::PrepareClose_Impl( bool bUI ) } - SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const { if ( pChildArr && pChildArr->size() > nPos ) @@ -454,7 +452,6 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) } - SfxFrameDescriptor* SfxFrame::GetDescriptor() const { // Create a FrameDescriptor On Demand; if there is no TopLevel-Frame diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 53502456e48c..60fcc2f0bded 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -62,7 +62,6 @@ using ::com::sun::star::lang::XComponent; using ::com::sun::star::frame::XComponentLoader; - class SfxFrameWindow_Impl : public vcl::Window { public: diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 87e216517c90..cf598e0ea7f2 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -598,7 +598,6 @@ IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void) } - // SfxInPlaceClient @@ -618,7 +617,6 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window *pDraw } - SfxInPlaceClient::~SfxInPlaceClient() { m_pViewSh->IPClientGone_Impl(this); diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index ee07c7850f21..ad4bc301c953 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -97,7 +97,6 @@ SvStream& SfxPrinter::Store( SvStream& rStream ) const } - SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : /* [Description] @@ -114,7 +113,6 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) : } - SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const JobSetup& rTheOrigJobSetup ) : @@ -131,7 +129,6 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, } - SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, const OUString& rPrinterName ) : @@ -145,7 +142,6 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, } - SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : Printer ( rPrinter.GetName() ), @@ -165,7 +161,6 @@ SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) : } - VclPtr<SfxPrinter> SfxPrinter::Clone() const { if ( IsDefPrinter() ) @@ -185,7 +180,6 @@ VclPtr<SfxPrinter> SfxPrinter::Clone() const } - SfxPrinter::~SfxPrinter() { disposeOnce(); @@ -199,14 +193,12 @@ void SfxPrinter::dispose() } - void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions ) { pOptions->Set(rNewOptions); } - SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent, SfxViewShell *pViewShell, const SfxItemSet *pSet) @@ -231,7 +223,6 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent, } - SfxPrintOptionsDialog::~SfxPrintOptionsDialog() { disposeOnce(); @@ -246,7 +237,6 @@ void SfxPrintOptionsDialog::dispose() } - short SfxPrintOptionsDialog::Execute() { if( ! pPage ) @@ -261,7 +251,6 @@ short SfxPrintOptionsDialog::Execute() } - bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) @@ -274,7 +263,6 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) } - void SfxPrintOptionsDialog::DisableHelp() { pDlgImpl->mbHelpDisabled = true; diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 53e9d124b1e1..364d53ff5f98 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1487,7 +1487,6 @@ IMPL_LINK_NOARG_TYPED ( SfxBaseController, CheckOutHandler, Button*, void ) } - Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () { SolarMutexGuard aGuard; diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 219f1967fe9f..c37293e62c50 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -77,8 +77,6 @@ void SfxFrameViewWindow_Impl::Resize() } - - void SfxViewFrame::UpdateTitle() /* [Description] diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index e9af2f4201a6..6896abe02dba 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -95,7 +95,6 @@ using namespace ::cppu; #include "sfxslots.hxx" - class SfxClipboardChangeListener : public ::cppu::WeakImplHelper< datatransfer::clipboard::XClipboardListener > { @@ -459,9 +458,6 @@ void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) } - - - void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { const sal_uInt16 nId = rReq.GetSlot(); @@ -810,7 +806,6 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) } - void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) { @@ -883,7 +878,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) } - void SfxViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) { @@ -909,7 +903,6 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/) } - void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient*/ ) { if ( !bActive ) @@ -917,7 +910,6 @@ void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient* } - void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) { uno::Reference < frame::XFrame > xOwnFrame( pFrame->GetFrame().GetFrameInterface() ); @@ -930,7 +922,6 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) } - void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) { if ( !pFrame->GetFrame().IsClosing_Impl() || SfxViewFrame::Current() != pFrame ) @@ -941,7 +932,6 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) } - SfxInPlaceClient* SfxViewShell::FindIPClient ( const uno::Reference < embed::XEmbeddedObject >& xObj, @@ -965,14 +955,12 @@ SfxInPlaceClient* SfxViewShell::FindIPClient } - SfxInPlaceClient* SfxViewShell::GetIPClient() const { return GetUIActiveClient(); } - SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const { // this method is needed as long as SFX still manages the border space for ChildWindows (see SfxFrame::Resize) @@ -1007,7 +995,6 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const } - void SfxViewShell::Activate( bool bMDI ) { if ( bMDI ) @@ -1021,13 +1008,11 @@ void SfxViewShell::Activate( bool bMDI ) } - void SfxViewShell::Deactivate(bool /*bMDI*/) { } - void SfxViewShell::AdjustPosSizePixel ( const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window @@ -1038,7 +1023,6 @@ void SfxViewShell::AdjustPosSizePixel } - void SfxViewShell::Move() /* [Description] @@ -1060,7 +1044,6 @@ void SfxViewShell::Move() } - void SfxViewShell::OuterResizePixel ( const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window @@ -1110,7 +1093,6 @@ void SfxViewShell::OuterResizePixel } - void SfxViewShell::InnerResizePixel ( const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window @@ -1160,7 +1142,6 @@ void SfxViewShell::InnerResizePixel } - void SfxViewShell::InvalidateBorder() { DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" ); @@ -1173,7 +1154,6 @@ void SfxViewShell::InvalidateBorder() } - void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) { DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" ); @@ -1188,7 +1168,6 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder ) } - const SvBorder& SfxViewShell::GetBorderPixel() const { DBG_ASSERT( GetViewFrame(), "SfxViewShell without SfxViewFrame" ); @@ -1197,7 +1176,6 @@ const SvBorder& SfxViewShell::GetBorderPixel() const } - void SfxViewShell::SetWindow ( vcl::Window* pViewPort // For example Null pointer in the Destructor. @@ -1239,7 +1217,6 @@ void SfxViewShell::SetWindow } - SfxViewShell::SfxViewShell ( SfxViewFrame* pViewFrame, /* <SfxViewFrame>, which will be @@ -1272,7 +1249,6 @@ SfxViewShell::SfxViewShell } - SfxViewShell::~SfxViewShell() { @@ -1324,7 +1300,6 @@ bool SfxViewShell::PrepareClose } - SfxViewShell* SfxViewShell::Current() { SfxViewFrame *pCurrent = SfxViewFrame::Current(); @@ -1332,7 +1307,6 @@ SfxViewShell* SfxViewShell::Current() } - SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) { if ( !i_rController.is() ) @@ -1350,7 +1324,6 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) } - SdrView* SfxViewShell::GetDrawView() const /* [Description] @@ -1366,7 +1339,6 @@ SdrView* SfxViewShell::GetDrawView() const } - OUString SfxViewShell::GetSelectionText ( bool /*bCompleteWords*/ /* FALSE (default) @@ -1396,7 +1368,6 @@ OUString SfxViewShell::GetSelectionText } - bool SfxViewShell::HasSelection( bool ) const /* [Description] @@ -1477,13 +1448,11 @@ void SfxViewShell::PushSubShells_Impl( bool bPush ) } - void SfxViewShell::WriteUserData( OUString&, bool ) { } - void SfxViewShell::ReadUserData(const OUString&, bool ) { } @@ -1497,7 +1466,6 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue } - // returns the first shell of spec. type viewing the specified doc. SfxViewShell* SfxViewShell::GetFirst ( @@ -1576,7 +1544,6 @@ SfxViewShell* SfxViewShell::GetNext } - void SfxViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { @@ -1672,7 +1639,6 @@ bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ) } - void SfxViewShell::ShowCursor( bool /*bOn*/ ) /* [Description] @@ -1685,7 +1651,6 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ ) } - void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) { @@ -1702,7 +1667,6 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) } - void SfxViewShell::DisconnectAllClients() { SfxInPlaceClientList *pClients = pImp->GetIPClientList_Impl(false); @@ -1715,13 +1679,11 @@ void SfxViewShell::DisconnectAllClients() } - void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const { } - void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) { SfxInPlaceClientList *pClients = pImp->GetIPClientList_Impl(false); @@ -1795,14 +1757,12 @@ void SfxViewShell::DiscardClients_Impl() } - SfxObjectShell* SfxViewShell::GetObjectShell() { return pFrame ? pFrame->GetObjectShell() : nullptr; } - Reference< XModel > SfxViewShell::GetCurrentDocument() const { Reference< XModel > xDocument; @@ -1815,7 +1775,6 @@ Reference< XModel > SfxViewShell::GetCurrentDocument() const } - void SfxViewShell::SetCurrentDocument() const { uno::Reference< frame::XModel > xDocument( GetCurrentDocument() ); @@ -1824,14 +1783,12 @@ void SfxViewShell::SetCurrentDocument() const } - const Size& SfxViewShell::GetMargin() const { return pImp->aMargin; } - void SfxViewShell::SetMargin( const Size& rSize ) { // the default margin was verified using www.apple.com !! diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index ccd537bec1f7..efc7c2d20f17 100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -130,7 +130,6 @@ static inline void OutputDebugStringFormat( LPCSTR, ... ) #endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index 40c97ed72444..484b055a98ab 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -37,7 +37,6 @@ public: }; - // Simple wrapper around expat, the xml parser library // created by James Clark diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx index 5a6311f068d2..9aea14ea2419 100644 --- a/shell/source/backends/localebe/localebackend.cxx +++ b/shell/source/backends/localebe/localebackend.cxx @@ -204,26 +204,22 @@ static OUString ImplGetLocale(int category) #endif - LocaleBackend::LocaleBackend() { } - LocaleBackend::~LocaleBackend() { } - LocaleBackend* LocaleBackend::createInstance() { return new LocaleBackend; } - OUString LocaleBackend::getLocale() { #if defined WNT @@ -236,7 +232,6 @@ OUString LocaleBackend::getLocale() } - OUString LocaleBackend::getUILocale() { #if defined WNT @@ -249,7 +244,6 @@ OUString LocaleBackend::getUILocale() } - OUString LocaleBackend::getSystemLocale() { // note: the implementation differs from getLocale() only on Windows @@ -301,7 +295,6 @@ css::uno::Any LocaleBackend::getPropertyValue( } - OUString SAL_CALL LocaleBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ; } diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index 6d79a0101e2e..c4216e0a6c37 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -26,7 +26,6 @@ namespace uno = com::sun::star::uno ; - static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( SAL_UNUSED_PARAMETER const uno::Reference<uno::XComponentContext>&){ @@ -34,7 +33,6 @@ static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend( } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -49,7 +47,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, @@ -63,5 +60,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 8073f69c037e..3cf519809043 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -27,7 +27,6 @@ namespace uno = com::sun::star::uno; - static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend( const uno::Reference<uno::XComponentContext>&) { @@ -35,7 +34,6 @@ static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend( } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -50,7 +48,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = }; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { @@ -62,5 +59,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( con } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index e08fc29536af..86181ad90a76 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -101,7 +101,6 @@ namespace // private } // end private namespace - WinInetBackend::WinInetBackend() { Library hWinInetDll( LoadLibrary( WININET_DLL_NAME ) ); @@ -297,20 +296,17 @@ WinInetBackend::WinInetBackend() } - WinInetBackend::~WinInetBackend() { } - WinInetBackend* WinInetBackend::createInstance() { return new WinInetBackend; } - void WinInetBackend::setPropertyValue( OUString const &, css::uno::Any const &) throw ( @@ -361,13 +357,11 @@ css::uno::Any WinInetBackend::getPropertyValue( } - OUString SAL_CALL WinInetBackend::getBackendName() { return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ; } - OUString SAL_CALL WinInetBackend::getImplementationName() throw (uno::RuntimeException) { diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 8958ac1dc596..e34ddaa31298 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -27,7 +27,6 @@ namespace uno = com::sun::star::uno ; - static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend( const uno::Reference<uno::XComponentContext>&){ @@ -35,7 +34,6 @@ static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend( } - static const cppu::ImplementationEntry kImplementations_entries[] = { { @@ -50,7 +48,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { @@ -63,5 +60,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 71cdb6b1b650..d53347e056cc 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -37,7 +37,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 32a744846332..9a432519507d 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -71,7 +71,6 @@ namespace // private } // end private namespace - CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) : WeakImplHelper< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >() { diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 46cd6d14c41e..7dadfd213e24 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -79,7 +79,6 @@ void escapeForShell( OStringBuffer & rBuffer, const OString & rURL) } - ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : WeakImplHelper< XSystemShellExecute, XServiceInfo >(), m_xContext(xContext) @@ -102,7 +101,6 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) : } - void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException, std::exception) { diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index 6a26ef0b25e3..5c1fc4f49c36 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -35,7 +35,6 @@ using com::sun::star::system::XSystemShellExecute; #define SHELLEXEC_IMPL_NAME "com.sun.star.comp.system.SystemShellExecute" - namespace { Reference< XInterface > SAL_CALL createInstance(const Reference< XComponentContext >& xContext) diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx index 1a48b180d54a..c1a624fa1f66 100644 --- a/shell/source/unix/exec/urltest.cxx +++ b/shell/source/unix/exec/urltest.cxx @@ -27,7 +27,6 @@ #include <strings.h> - int main(int argc, const char *argv[]) { int ret = 0; diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx index 86092f99ee86..2bf7d7eb30b0 100644 --- a/shell/source/unix/sysshell/recently_used_file.cxx +++ b/shell/source/unix/sysshell/recently_used_file.cxx @@ -130,6 +130,4 @@ bool recently_used_file::eof() const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 441cfc50451b..baecf1a133fa 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -172,7 +172,6 @@ namespace // private #define E_UNKNOWN_EXEC_ERROR -1 - bool is_system_path(const OUString& path_or_uri) { OUString url; @@ -201,7 +200,6 @@ namespace // private } - bool is_existing_file(const OUString& file_name) { OSL_ASSERT(is_system_path(file_name)); @@ -242,7 +240,6 @@ namespace // private } // end namespace - CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext ) : WeakComponentImplHelper< XSystemShellExecute, XServiceInfo >( m_aMutex ), m_xContext(xContext) @@ -259,7 +256,6 @@ CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext } - void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException) { diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index d6d2bf403d86..0f2d91332872 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -37,7 +37,6 @@ using com::sun::star::system::XSystemShellExecute; #define SYSSHEXEC_IMPL_NAME "com.sun.star.sys.shell.SystemShellExecute" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XComponentContext >& xContext ) diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx index 7035c8d714ec..823618a1349f 100644 --- a/shell/source/win32/ooofilereader/basereader.cxx +++ b/shell/source/win32/ooofilereader/basereader.cxx @@ -32,26 +32,22 @@ m_ZipFile( DocumentName ) } - CBaseReader::CBaseReader(StreamInterface * sw): m_ZipFile( sw ) { } - CBaseReader::~CBaseReader() { } - void CBaseReader::start_document() { } - void CBaseReader::end_document() { } diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 977b3ce8168e..9ca1efedfaf0 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -31,11 +31,9 @@ using ::std::min; #include "internal/shlxthdl.hxx" - long CClassFactory::s_ServerLocks = 0; - CClassFactory::CClassFactory(const CLSID& clsid) : m_RefCnt(1), m_Clsid(clsid) @@ -44,7 +42,6 @@ CClassFactory::CClassFactory(const CLSID& clsid) : } - CClassFactory::~CClassFactory() { InterlockedDecrement(&g_DllRefCnt); @@ -70,14 +67,12 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_ } - ULONG STDMETHODCALLTYPE CClassFactory::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CClassFactory::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -128,7 +123,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( } - HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) { if (fLock) @@ -140,7 +134,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock) } - bool CClassFactory::IsLocked() { return (s_ServerLocks > 0); diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index ac45cb7faf62..8f3f11e5a4b7 100644 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -43,7 +43,6 @@ namespace /* private */ } - CColumnInfo::CColumnInfo(long RefCnt) : m_RefCnt(RefCnt) { @@ -51,7 +50,6 @@ CColumnInfo::CColumnInfo(long RefCnt) : } - CColumnInfo::~CColumnInfo() { InterlockedDecrement(&g_DllRefCnt); @@ -77,14 +75,12 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA } - ULONG STDMETHODCALLTYPE CColumnInfo::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CColumnInfo::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -188,7 +184,6 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOL } - bool CColumnInfo::IsOOFileExtension(wchar_t* Extension) const { for (size_t i = 0; i < OOFileExtensionTableSize; i++) diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index 4d6241a40ca1..6f309485c93d 100644 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -39,7 +39,6 @@ const std::wstring WSPACE = std::wstring(SPACE); - CInfoTip::CInfoTip(long RefCnt) : m_RefCnt(RefCnt) { @@ -48,7 +47,6 @@ CInfoTip::CInfoTip(long RefCnt) : } - CInfoTip::~CInfoTip() { InterlockedDecrement(&g_DllRefCnt); @@ -83,14 +81,12 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR * } - ULONG STDMETHODCALLTYPE CInfoTip::AddRef() { return InterlockedIncrement(&m_RefCnt); } - ULONG STDMETHODCALLTYPE CInfoTip::Release() { long refcnt = InterlockedDecrement(&m_RefCnt); @@ -301,7 +297,6 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws } - HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoFlags(DWORD * /*pdwFlags*/ ) { return E_NOTIMPL; @@ -346,28 +341,24 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ } - HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty() { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fRemember*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE CInfoTip::GetCurFile(LPOLESTR __RPC_FAR * /*ppszFileName*/) { return E_NOTIMPL; diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 819d5a4b0eba..1b160f00e325 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -18,7 +18,6 @@ */ - // File: ooofilt.cxx // Contents: Filter Implementation for OpenOffice.Org Document using // Indexing Service @@ -1233,7 +1232,6 @@ STDAPI DllRegisterServer() } - STDAPI DllUnregisterServer() { return S_OK; diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index f38070621406..8dc7b0129f6a 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -59,7 +59,6 @@ PROPERTYMAP g_rgPROPERTYMAP[] = size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]); - CPropertyHdl::CPropertyHdl( long nRefCnt ) : m_RefCnt( nRefCnt ), m_pCache( NULL ) @@ -69,7 +68,6 @@ CPropertyHdl::CPropertyHdl( long nRefCnt ) : } - CPropertyHdl::~CPropertyHdl() { if ( m_pCache ) diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx index 45a747784600..1a4a21d6c7ab 100644 --- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx +++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx @@ -26,8 +26,6 @@ #include "internal/metainforeader.hxx" - - struct statistic_item { statistic_item(); @@ -47,20 +45,17 @@ struct statistic_item }; - typedef std::vector<statistic_item> statistic_item_list_t; typedef std::pair<std::wstring, statistic_item_list_t> statistic_group_t; typedef std::vector<statistic_group_t> statistic_group_list_t; - class document_statistic_reader; typedef std::unique_ptr<document_statistic_reader> document_statistic_reader_ptr; document_statistic_reader_ptr create_document_statistic_reader(const std::string& document_name, CMetaInfoReader* meta_info_accessor); - class document_statistic_reader { public: @@ -86,7 +81,6 @@ private: }; - class writer_document_statistic_reader : public document_statistic_reader { protected: @@ -99,7 +93,6 @@ protected: }; - class calc_document_statistic_reader : public document_statistic_reader { protected: @@ -112,7 +105,6 @@ protected: }; - class draw_impress_math_document_statistic_reader : public document_statistic_reader { protected: diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 7984f2dc22dc..90d6b7fd9d1d 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -32,7 +32,6 @@ #include "internal/resource.h" - list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2) { @@ -43,7 +42,6 @@ list_view_builder_ptr create_list_view_builder( } - list_view_builder::list_view_builder( HWND hwnd_list_view, const std::wstring& column1_title, @@ -56,13 +54,11 @@ list_view_builder::list_view_builder( } - list_view_builder::~list_view_builder() { } - void list_view_builder::build(statistic_group_list_t& gl) { setup_list_view(); @@ -84,7 +80,6 @@ void list_view_builder::build(statistic_group_list_t& gl) } - void list_view_builder::setup_list_view() { HIMAGELIST h_ils = ImageList_Create(16,15,ILC_MASK, 7, 0); @@ -114,14 +109,12 @@ void list_view_builder::setup_list_view() } - void list_view_builder::insert_group(const std::wstring& /*title*/) { insert_item(L"", L"", false); } - void list_view_builder::insert_item(const std::wstring& title, const std::wstring& value, bool is_editable) { LVITEM lvi; @@ -154,14 +147,12 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin } - HWND list_view_builder::get_list_view() const { return hwnd_list_view_; } - winxp_list_view_builder::winxp_list_view_builder( HWND hwnd_list_view, const std::wstring& column1_title, @@ -173,7 +164,6 @@ winxp_list_view_builder::winxp_list_view_builder( } - void winxp_list_view_builder::setup_list_view() { list_view_builder::setup_list_view(); @@ -182,7 +172,6 @@ void winxp_list_view_builder::setup_list_view() } - void winxp_list_view_builder::insert_group(const std::wstring& name) { LVGROUP lvg; @@ -201,7 +190,6 @@ void winxp_list_view_builder::insert_group(const std::wstring& name) } - void winxp_list_view_builder::insert_item( const std::wstring& title, const std::wstring& value, bool is_editable) { diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx index 870c33c1dd87..bb0072f49da4 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.hxx @@ -33,7 +33,6 @@ #include "document_statistic.hxx" - class list_view_builder; typedef std::unique_ptr<list_view_builder> list_view_builder_ptr; @@ -42,7 +41,6 @@ list_view_builder_ptr create_list_view_builder( HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2); - class list_view_builder { public: @@ -74,7 +72,6 @@ private: }; - class winxp_list_view_builder : public list_view_builder { protected: diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 6d1a146bfd34..aa938e53a405 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -53,7 +53,6 @@ ----------------------------------------------*/ - CPropertySheet::CPropertySheet(long RefCnt) : m_RefCnt(RefCnt) { @@ -62,7 +61,6 @@ CPropertySheet::CPropertySheet(long RefCnt) : } - CPropertySheet::~CPropertySheet() { OutputDebugStringFormat("CPropertySheet::DTor [%d], [%d]", m_RefCnt, g_DllRefCnt ); @@ -98,7 +96,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface( } - ULONG STDMETHODCALLTYPE CPropertySheet::AddRef() { OutputDebugStringFormat("CPropertySheet::AddRef [%d]", m_RefCnt ); @@ -106,7 +103,6 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef() } - ULONG STDMETHODCALLTYPE CPropertySheet::Release() { OutputDebugStringFormat("CPropertySheet::Release [%d]", m_RefCnt ); @@ -248,7 +244,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP } - HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/) { @@ -256,7 +251,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage( } - UINT CALLBACK CPropertySheet::PropPageSummaryCallback( HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE ppsp) { @@ -274,8 +268,6 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback( } - - BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { switch (uiMsg) @@ -293,7 +285,6 @@ BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM } - BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { switch (uiMsg) diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 2983b381a1ab..821e91b2f747 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -295,7 +295,6 @@ namespace /* private */ } // namespace /* private */ - // COM exports diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index 3062f8402966..15ab6b314a6c 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -288,8 +288,6 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Clone(IStream **) { return E_NOTIMPL; } - - CThumbviewer::CThumbviewer(long RefCnt) : ref_count_(RefCnt) { diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index 2ee68f3b5f42..b827e5c896c8 100644 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -22,7 +22,6 @@ #include <sal/macros.h> - const std::string WRITER_FILE_EXTENSIONS = "sxwstwsxgodtottodm"; const std::string CALC_FILE_EXTENSIONS = "sxcstcodsots"; const std::string DRAW_FILE_EXTENSIONS = "sxdstdodgotg"; diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx index 2e2838c1f805..ed000debeff9 100644 --- a/shell/source/win32/shlxthandler/util/registry.cxx +++ b/shell/source/win32/shlxthandler/util/registry.cxx @@ -58,7 +58,6 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co } - bool DeleteRegistryKey(HKEY RootKey, const char* KeyName) { HKEY hKey; @@ -157,7 +156,6 @@ std::string ClsidToString(const CLSID& clsid) } - bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, char *pszData, DWORD dwBufLen) { HKEY hKey; diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 651aba743d87..bf797489f54b 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -37,7 +37,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_IMPL_NAME "com.sun.star.sys.shell.SimpleSystemMail" - namespace { Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& ) diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx index 1870b16ad3b0..bb79921bcf67 100644 --- a/shell/source/win32/simplemail/smplmailmsg.cxx +++ b/shell/source/win32/simplemail/smplmailmsg.cxx @@ -56,7 +56,6 @@ void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody ) } - void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) throw (RuntimeException) { @@ -64,7 +63,6 @@ void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient ) } - OUString SAL_CALL CSmplMailMsg::getRecipient( ) throw (RuntimeException) { @@ -72,7 +70,6 @@ OUString SAL_CALL CSmplMailMsg::getRecipient( ) } - void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient ) throw (RuntimeException) { @@ -80,7 +77,6 @@ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecip } - Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) throw (RuntimeException) { @@ -88,7 +84,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient( ) } - void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient ) throw (RuntimeException) { @@ -96,7 +91,6 @@ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRec } - Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) throw (RuntimeException) { @@ -104,7 +98,6 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient( ) } - void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) throw (RuntimeException) { @@ -112,7 +105,6 @@ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator ) } - OUString SAL_CALL CSmplMailMsg::getOriginator( ) throw (RuntimeException) { @@ -120,7 +112,6 @@ OUString SAL_CALL CSmplMailMsg::getOriginator( ) } - void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) throw (RuntimeException) { @@ -128,7 +119,6 @@ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject ) } - OUString SAL_CALL CSmplMailMsg::getSubject( ) throw (RuntimeException) { @@ -136,7 +126,6 @@ OUString SAL_CALL CSmplMailMsg::getSubject( ) } - void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement ) throw (IllegalArgumentException, RuntimeException) { @@ -144,7 +133,6 @@ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttache } - Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement( ) throw (RuntimeException) { diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index f2a28953327d..d01fff0c5707 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -41,7 +41,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setRecipient( const OUString& aRecipient ) throw (css::uno::RuntimeException); @@ -49,7 +48,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient ) throw (css::uno::RuntimeException); @@ -57,7 +55,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient ) throw (css::uno::RuntimeException); @@ -65,7 +62,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setOriginator( const OUString& aOriginator ) throw (css::uno::RuntimeException); @@ -73,7 +69,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setSubject( const OUString& aSubject ) throw (css::uno::RuntimeException); @@ -81,7 +76,6 @@ public: throw (css::uno::RuntimeException); - virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx index a33e7a81d4f2..74db0a71a695 100644 --- a/shell/source/win32/workbench/TestSmplMail.cxx +++ b/shell/source/win32/workbench/TestSmplMail.cxx @@ -58,7 +58,6 @@ Reference< XMultiServiceFactory > g_xFactory; // main - // int SAL_CALL main(int nArgc, char* Argv[], char* pEnv[] ) // make Warning free, leave out typename int SAL_CALL main(int , char*, char* ) diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx index 72d352a4774e..693e81dca2c4 100644 --- a/shell/source/win32/workbench/TestSysShExec.cxx +++ b/shell/source/win32/workbench/TestSysShExec.cxx @@ -57,11 +57,9 @@ using namespace com::sun::star::system; Reference< XMultiServiceFactory > g_xFactory; - // main - // int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) int SAL_CALL main(int nArgc, char* Argv[], char* ) { diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index 17b1e3c9eaa9..7e5778177d0e 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -152,7 +152,6 @@ namespace slideshow } - // HSLColor @@ -194,9 +193,6 @@ namespace slideshow } - - - bool operator==( const HSLColor& rLHS, const HSLColor& rRHS ) { return ( rLHS.getHue() == rRHS.getHue() && @@ -265,11 +261,9 @@ namespace slideshow } - // RGBColor - RGBColor::RGBTriple::RGBTriple() : mnRed(), mnGreen(), @@ -309,8 +303,6 @@ namespace slideshow } - - ::cppcanvas::Color::IntSRGBA RGBColor::getIntegerColor() const { return ::cppcanvas::makeColor( colorToInt( getRed() ), diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index 6c55a1178253..9ac9898508b8 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -52,7 +52,6 @@ private: }; - class RewinderAnimationEventHandler : public AnimationEventHandler { public: @@ -66,7 +65,6 @@ private: }; - } // end of anonymous namespace @@ -91,8 +89,6 @@ EffectRewinder::EffectRewinder ( } - - void EffectRewinder::initialize() { // Add some event handlers so that we are informed when @@ -119,16 +115,12 @@ void EffectRewinder::initialize() } - - EffectRewinder::~EffectRewinder() { dispose(); } - - void EffectRewinder::dispose() { if (mpAsynchronousRewindEvent) @@ -157,8 +149,6 @@ void EffectRewinder::dispose() } - - void EffectRewinder::setRootAnimationNode ( const uno::Reference<animations::XAnimationNode>& xRootNode) { @@ -166,8 +156,6 @@ void EffectRewinder::setRootAnimationNode ( } - - bool EffectRewinder::rewind ( const ::boost::shared_ptr<ScreenUpdater::UpdateLock>& rpPaintLock, const ::std::function<void ()>& rSlideRewindFunctor, @@ -225,8 +213,6 @@ bool EffectRewinder::rewind ( } - - void EffectRewinder::skipAllMainSequenceEffects() { // Do not allow nested rewinds. @@ -249,8 +235,6 @@ void EffectRewinder::skipAllMainSequenceEffects() } - - sal_Int32 EffectRewinder::countMainSequenceEffects() { // Determine the number of main sequence effects. @@ -292,8 +276,6 @@ sal_Int32 EffectRewinder::countMainSequenceEffects() } - - void EffectRewinder::skipSingleMainSequenceEffects() { // This basically just starts the next effect and then skips over its @@ -305,8 +287,6 @@ void EffectRewinder::skipSingleMainSequenceEffects() } - - bool EffectRewinder::resetEffectCount() { mnMainSequenceEffectCount = 0; @@ -314,8 +294,6 @@ bool EffectRewinder::resetEffectCount() } - - bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode) { // This notification is only relevant for us when the rpNode belongs to @@ -349,8 +327,6 @@ bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& rpNode) } - - void EffectRewinder::asynchronousRewind ( sal_Int32 nEffectCount, const bool bRedisplayCurrentSlide, @@ -395,8 +371,6 @@ void EffectRewinder::asynchronousRewind ( } - - void EffectRewinder::asynchronousRewindToPreviousSlide ( const ::std::function<void ()>& rSlideRewindFunctor) { @@ -407,8 +381,6 @@ void EffectRewinder::asynchronousRewindToPreviousSlide ( } - - } } // end of namespace ::slideshow::internal /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index ef9a95945f4f..a9d1cf6c1c0c 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -97,8 +97,6 @@ public: }; - - typedef cppu::WeakComponentImplHelper< awt::XMouseListener, awt::XMouseMotionListener > Listener_UnoBase; @@ -153,9 +151,6 @@ private: }; - - - struct EventMultiplexerImpl { EventMultiplexerImpl( EventQueue& rEventQueue, @@ -307,9 +302,6 @@ struct EventMultiplexerImpl }; - - - void SAL_CALL EventMultiplexerListener::disposing() { osl::MutexGuard const guard( m_aMutex ); @@ -403,9 +395,6 @@ void SAL_CALL EventMultiplexerListener::mouseMoved( } - - - bool EventMultiplexerImpl::notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer, AnimationNodeSharedPtr const& rNode ) { @@ -691,8 +680,6 @@ bool EventMultiplexerImpl::notifyNextEffect() } - - EventMultiplexer::EventMultiplexer( EventQueue& rEventQueue, UnoViewContainer const& rViewContainer ) : mpImpl( new EventMultiplexerImpl(rEventQueue, rViewContainer) ) diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index 0959fdb2db3d..4efd329012af 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -234,8 +234,6 @@ UpdateLock::UpdateLock ( } - - UpdateLock::~UpdateLock() { if (mbIsActivated) @@ -243,8 +241,6 @@ UpdateLock::~UpdateLock() } - - void UpdateLock::Activate() { if ( ! mbIsActivated) diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 5bf234780dd2..1ae8905b0309 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -123,7 +123,6 @@ namespace slideshow } - void AppletShape::implViewChanged( const UnoViewSharedPtr& rView ) { const ::basegfx::B2DRectangle& rBounds = getBounds(); @@ -136,7 +135,6 @@ namespace slideshow } - void AppletShape::implViewsChanged() { // resize all ViewShapes @@ -146,7 +144,6 @@ namespace slideshow } - void AppletShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, bool bRedrawLayer ) { @@ -175,7 +172,6 @@ namespace slideshow } - bool AppletShape::removeViewLayer( const ViewLayerSharedPtr& rLayer ) { const ViewAppletShapeVector::iterator aEnd( maViewAppletShapes.end() ); @@ -214,7 +210,6 @@ namespace slideshow } - bool AppletShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const { // redraw all view shapes, by calling their update() method @@ -234,7 +229,6 @@ namespace slideshow } - bool AppletShape::implStartIntrinsicAnimation() { const ::basegfx::B2DRectangle& rBounds = getBounds(); @@ -247,7 +241,6 @@ namespace slideshow } - bool AppletShape::implEndIntrinsicAnimation() { for( const auto& pViewAppletShape : maViewAppletShapes ) @@ -268,14 +261,12 @@ namespace slideshow } - bool AppletShape::implIsIntrinsicAnimationPlaying() const { return mbIsPlaying; } - void AppletShape::implSetIntrinsicAnimationTime(double) { // No way of doing this, or? diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index a0dcb61bce2e..e4ceecc694d1 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -114,9 +114,6 @@ namespace slideshow }; - - - BackgroundShape::BackgroundShape( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< drawing::XDrawPage >& xMasterPage, const SlideShowContext& rContext ) : @@ -290,7 +287,6 @@ namespace slideshow } - ShapeSharedPtr createBackgroundShape( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference< drawing::XDrawPage >& xMasterPage, diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 5804f7e03c87..89f54593805d 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -193,7 +193,6 @@ private: double GetMixerState(sal_uInt32 nTime); - SlideShowContext maContext; boost::shared_ptr<WakeupEvent> mpWakeupEvent; boost::weak_ptr<DrawShape> mpParentDrawShape; @@ -244,7 +243,6 @@ private: }; - class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler, private boost::noncopyable { @@ -262,7 +260,6 @@ private: }; - double ActivityImpl::GetMixerState( sal_uInt32 nTime ) { if( meAnimKind == drawing::TextAnimationKind_BLINK ) diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 16b157951e50..0abeade1553b 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -77,7 +77,6 @@ namespace slideshow // Private methods - GDIMetaFileSharedPtr DrawShape::forceScrollTextMetaFile() { if ((mnCurrMtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != MTF_LOAD_SCROLL_TEXT_MTF) @@ -512,11 +511,9 @@ namespace slideshow } - // Public methods - DrawShapeSharedPtr DrawShape::create( const uno::Reference< drawing::XShape >& xShape, const uno::Reference< drawing::XDrawPage >& xContainingPage, diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 3a62136209e4..053d22efcabe 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -42,11 +42,9 @@ namespace slideshow { - // Private methods - void DrawShapeSubsetting::ensureInitializedNodeTree() const { ENSURE_OR_THROW( mpMtf, @@ -218,11 +216,9 @@ namespace slideshow } - // Public methods - DrawShapeSubsetting::DrawShapeSubsetting() : maActionClassVector(), mpMtf(), diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index a193c49007bb..d181ab816991 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -100,7 +100,6 @@ namespace slideshow } - ExternalShapeBase::~ExternalShapeBase() { try @@ -118,56 +117,48 @@ namespace slideshow } - uno::Reference< drawing::XShape > ExternalShapeBase::getXShape() const { return mxShape; } - void ExternalShapeBase::play() { implStartIntrinsicAnimation(); } - void ExternalShapeBase::stop() { implEndIntrinsicAnimation(); } - void ExternalShapeBase::pause() { implPauseIntrinsicAnimation(); } - bool ExternalShapeBase::isPlaying() const { return implIsIntrinsicAnimationPlaying(); } - void ExternalShapeBase::setMediaTime(double fTime) { implSetIntrinsicAnimationTime(fTime); } - bool ExternalShapeBase::update() const { return render(); } - bool ExternalShapeBase::render() const { if( maBounds.getRange().equalZero() ) @@ -181,49 +172,42 @@ namespace slideshow } - bool ExternalShapeBase::isContentChanged() const { return true; } - ::basegfx::B2DRectangle ExternalShapeBase::getBounds() const { return maBounds; } - ::basegfx::B2DRectangle ExternalShapeBase::getDomBounds() const { return maBounds; } - ::basegfx::B2DRectangle ExternalShapeBase::getUpdateArea() const { return maBounds; } - bool ExternalShapeBase::isVisible() const { return true; } - double ExternalShapeBase::getPriority() const { return mnPriority; } - bool ExternalShapeBase::isBackgroundDetached() const { // external shapes always have their own window/surface diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index 6fbc729bb5cf..ac7190515e3e 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -37,7 +37,6 @@ class GDIMetaFile; class Graphic; - namespace slideshow { namespace internal diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index 64130e05f1dc..a1fd73b0f671 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -95,7 +95,6 @@ namespace slideshow }; - class IntrinsicAnimationListener : public IntrinsicAnimationEventHandler, private boost::noncopyable { @@ -113,7 +112,6 @@ namespace slideshow }; - IntrinsicAnimationActivity::IntrinsicAnimationActivity( const SlideShowContext& rContext, const DrawShapeSharedPtr& rDrawShape, const WakeupEventSharedPtr& rWakeupEvent, @@ -257,7 +255,6 @@ namespace slideshow } - ActivitySharedPtr createIntrinsicAnimationActivity( const SlideShowContext& rContext, const DrawShapeSharedPtr& rDrawShape, diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index 00c029def801..e9f936113daa 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -100,7 +100,6 @@ namespace slideshow } - void MediaShape::implViewChanged( const UnoViewSharedPtr& rView ) { const ::basegfx::B2DRectangle& rBounds = getBounds(); @@ -111,7 +110,6 @@ namespace slideshow } - void MediaShape::implViewsChanged() { const ::basegfx::B2DRectangle& rBounds = getBounds(); @@ -121,7 +119,6 @@ namespace slideshow } - void MediaShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer, bool bRedrawLayer ) { @@ -139,7 +136,6 @@ namespace slideshow } - bool MediaShape::removeViewLayer( const ViewLayerSharedPtr& rLayer ) { const ViewMediaShapeVector::iterator aEnd( maViewMediaShapes.end() ); @@ -178,7 +174,6 @@ namespace slideshow } - bool MediaShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const { // redraw all view shapes, by calling their update() method @@ -198,7 +193,6 @@ namespace slideshow } - bool MediaShape::implStartIntrinsicAnimation() { for( const auto& pViewMediaShape : maViewMediaShapes ) @@ -210,7 +204,6 @@ namespace slideshow } - bool MediaShape::implEndIntrinsicAnimation() { for( const auto& pViewMediaShape : maViewMediaShapes ) @@ -234,14 +227,12 @@ namespace slideshow } - bool MediaShape::implIsIntrinsicAnimationPlaying() const { return mbIsPlaying; } - void MediaShape::implSetIntrinsicAnimationTime(double fTime) { for( const auto& pViewMediaShape : maViewMediaShapes ) @@ -249,7 +240,6 @@ namespace slideshow } - ShapeSharedPtr createMediaShape( const uno::Reference< drawing::XShape >& xShape, double nPrio, diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 7afef45cb56a..f13279092681 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -98,7 +98,6 @@ namespace slideshow } - ViewAppletShape::~ViewAppletShape() { try @@ -115,7 +114,6 @@ namespace slideshow } - ViewLayerSharedPtr ViewAppletShape::getViewLayer() const { return mpViewLayer; @@ -210,7 +208,6 @@ namespace slideshow } - void ViewAppletShape::endApplet() { uno::Reference<util::XCloseable> xCloseable( @@ -225,7 +222,6 @@ namespace slideshow } - bool ViewAppletShape::render( const ::basegfx::B2DRectangle& rBounds ) const { ::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas(); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 3a7b01678b11..f76db4359c13 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -95,7 +95,6 @@ namespace slideshow } - ViewMediaShape::~ViewMediaShape() { try @@ -112,7 +111,6 @@ namespace slideshow } - ViewLayerSharedPtr ViewMediaShape::getViewLayer() const { return mpViewLayer; @@ -132,7 +130,6 @@ namespace slideshow } - void ViewMediaShape::endMedia() { // shutdown player window @@ -164,7 +161,6 @@ namespace slideshow } - void ViewMediaShape::pauseMedia() { if (mxPlayer.is()) @@ -172,7 +168,6 @@ namespace slideshow } - void ViewMediaShape::setMediaTime(double fTime) { if (mxPlayer.is()) @@ -180,7 +175,6 @@ namespace slideshow } - bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const { #if !HAVE_FEATURE_AVMEDIA @@ -298,7 +292,6 @@ namespace slideshow } - bool ViewMediaShape::implInitialize( const ::basegfx::B2DRectangle& rBounds ) { if( !mxPlayer.is() && mxShape.is() ) @@ -360,7 +353,6 @@ namespace slideshow } - void ViewMediaShape::implSetMediaProperties( const uno::Reference< beans::XPropertySet >& rxProps ) { if( mxPlayer.is() ) @@ -400,7 +392,6 @@ namespace slideshow } - void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL, const OUString& rMimeType ) { #if !HAVE_FEATURE_AVMEDIA diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index e9180a774701..a10d34602564 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -712,8 +712,6 @@ namespace slideshow } - - ViewShape::ViewShape( const ViewLayerSharedPtr& rViewLayer ) : mpViewLayer( rViewLayer ), maRenderers(), diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 666fa5227e58..535d1e138d21 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -92,9 +92,6 @@ namespace slideshow static ::boost::shared_ptr< Layer > createLayer( const basegfx::B2DRange& rMaxLayerBounds ); - - - /** Predicate, whether this layer is the special background layer @@ -133,9 +130,6 @@ namespace slideshow void setShapeViews( ShapeSharedPtr const& rShape ) const; - - - /** Change layer priority range. The layer priority affects the position of the layer diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index 6426c79da8a4..97f5425fb251 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -250,9 +250,6 @@ namespace slideshow typedef ::std::set< ShapeSharedPtr > ShapeUpdateSet; - - - /// Adds shape area to containing layer's damage area void addUpdateArea( ShapeSharedPtr const& rShape ); diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index a484cae6a309..cf4b48b8a13d 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -405,7 +405,6 @@ bool ShapeManagerImpl::notifyIntrinsicAnimationsDisabled() } - } // namespace internal } // namespace presentation diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 45c98551b0e6..41dc57e18b63 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -68,7 +68,6 @@ using namespace ::com::sun::star; - namespace slideshow { namespace internal @@ -285,9 +284,6 @@ private: }; - - - void slideRenderer( SlideImpl* pSlide, const UnoViewSharedPtr& rView ) { // fully clear view content to background color @@ -314,9 +310,6 @@ void slideRenderer( SlideImpl* pSlide, const UnoViewSharedPtr& rView ) } - - - SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDrawPage, const uno::Reference<drawing::XDrawPagesSupplier>& xDrawPages, const uno::Reference< animations::XAnimationNode >& xRootNode, @@ -448,7 +441,6 @@ bool SlideImpl::show( bool bSlideBackgoundPainted ) mpShapeManager->activate( true ); - // render slide to screen, if requested if( !bSlideBackgoundPainted ) { @@ -459,7 +451,6 @@ bool SlideImpl::show( bool bSlideBackgoundPainted ) } - // fire up animations const bool bIsAnimated( isAnimated() ); if( bIsAnimated ) @@ -505,18 +496,15 @@ void SlideImpl::hide() return; // already hidden/disposed - // from now on, all animations are stopped meAnimationState = FINAL_STATE; - // disable user paint overlay under all circumstances, // this slide now ceases to be active. deactivatePaintOverlay(); - // switch off all shape-intrinsic animations. endIntrinsicAnimations(); @@ -524,7 +512,6 @@ void SlideImpl::hide() maAnimations.end(); - // disable shape management & event broadcasting for shapes of this // slide. Also disables LayerManager. mpShapeManager->deactivate(); @@ -614,7 +601,6 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r // private methods - void SlideImpl::viewAdded( const UnoViewSharedPtr& rView ) { maSlideBitmaps.push_back( diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx index 53d161a0d271..65bee1bb446b 100644 --- a/slideshow/source/engine/slideview.cxx +++ b/slideshow/source/engine/slideview.cxx @@ -236,8 +236,6 @@ basegfx::B2IRange getLayerBoundsPixel( basegfx::B2DRange const& rLayerBounds } - - /** Container class for sprites issued by a ViewLayer This class handles the sprite prioritization issues, that are @@ -367,9 +365,6 @@ public: }; - - - /** This class provides layers for a slide view Layers are used to render animations with the correct z order - @@ -662,8 +657,6 @@ private: }; - - typedef cppu::WeakComponentImplHelper< css::util::XModifyListener, css::awt::XPaintListener> SlideViewBase; diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx index 231884f1187f..148d5bbce137 100644 --- a/slideshow/source/engine/smilfunctionparser.cxx +++ b/slideshow/source/engine/smilfunctionparser.cxx @@ -47,7 +47,6 @@ #include <stack> - /* Implementation of SmilFunctionParser class */ namespace slideshow diff --git a/slideshow/source/engine/sp_debug.cxx b/slideshow/source/engine/sp_debug.cxx index e0ecd32c7821..664cfe297d7f 100644 --- a/slideshow/source/engine/sp_debug.cxx +++ b/slideshow/source/engine/sp_debug.cxx @@ -18,7 +18,6 @@ */ - // sp_collector.cpp // Copyright (c) 2002, 2003 Peter Dimov diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx index 3e674c397a53..9b6493dcf4a4 100644 --- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx +++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx @@ -47,7 +47,6 @@ #include <memory> - /*************************************************** *** *** *** Slide Transition Effects *** diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx index 692b1040a212..8306085ab5cc 100644 --- a/slideshow/source/engine/unoviewcontainer.cxx +++ b/slideshow/source/engine/unoviewcontainer.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; - namespace slideshow { namespace internal diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index d38499628053..6c54c400244f 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -533,7 +533,6 @@ void UserEventQueue::registerEvent( } - UserEventQueue::UserEventQueue( EventMultiplexer& rMultiplexer, EventQueue& rEventQueue, CursorManager& rCursorManager ) diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index db9f2aec3c45..d4288c8c2012 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -424,7 +424,6 @@ private: }; - /** ListenerContainer variant that serialized access This ListenerContainer is safe to use in a multi-threaded @@ -441,7 +440,6 @@ class ThreadSafeListenerContainer : public ListenerContainerBase<ListenerT, }; - /** ListenerContainer variant that does not serialize access This ListenerContainer version is not safe to use in a diff --git a/slideshow/test/tests.hxx b/slideshow/test/tests.hxx index 1cf44c831dd5..7ce77859903e 100644 --- a/slideshow/test/tests.hxx +++ b/slideshow/test/tests.hxx @@ -44,9 +44,6 @@ typedef boost::shared_ptr<TestView> TestViewSharedPtr; TestViewSharedPtr createTestView(); - - - class TestShape : public slideshow::internal::AnimatableShape { public: diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx index 8eaf58e01ee9..bfa05fd00b44 100644 --- a/slideshow/test/testshape.cxx +++ b/slideshow/test/testshape.cxx @@ -108,9 +108,6 @@ private: } - - - // Shape virtual uno::Reference< drawing::XShape > getXShape() const { diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx index ed4546c18b09..98607fbd9609 100644 --- a/smoketest/libtest.cxx +++ b/smoketest/libtest.cxx @@ -17,7 +17,6 @@ #include <LibreOfficeKit/LibreOfficeKit.hxx> - #ifdef _WIN32 //#include <Windows.h> // come from LibreOfficeKitInit.h long getTimeMS() diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 3b3fec3ac1e7..b31a20511f62 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1199,7 +1199,6 @@ static SotAction_Impl const aEXCHG_DEST_SDDOC_FREE_AREA_Link[] = \ }; - #define IMPL_DATA_ARRAY_1 \ EXCHG_EMPYT_ARRAY \ EXCHG_DEST_DOC_OLEOBJ_ARRAY \ @@ -1333,9 +1332,6 @@ static SotDestinationEntry_Impl const aDestinationArray[] = \ }; - - - // - new style GetExchange methods - @@ -1358,7 +1354,6 @@ bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, SotClipbo } - static bool CheckTransferableContext_Impl( const Reference< XTransferable >* pxTransferable, const SotAction_Impl& rEntry ) { DataFlavor aFlavor; @@ -1420,7 +1415,6 @@ static bool CheckTransferableContext_Impl( const Reference< XTransferable >* pxT } - static sal_uInt16 GetTransferableAction_Impl( const DataFlavorExVector& rDataFlavorExVector, const SotAction_Impl* pArray, @@ -1495,7 +1489,6 @@ static sal_uInt16 GetTransferableAction_Impl( } - sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorExVector, SotExchangeDest nDestination, sal_uInt16 nSourceOptions, @@ -1609,7 +1602,6 @@ sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavor } - sal_uInt16 SotExchange::IsChart( const SvGlobalName& rName ) { sal_uInt16 nRet=0; diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx index a6a63bb967df..fac1ed72cf5c 100644 --- a/sot/source/sdstor/stgavl.cxx +++ b/sot/source/sdstor/stgavl.cxx @@ -366,7 +366,6 @@ bool StgAvlNode::Remove( StgAvlNode** pRoot, StgAvlNode* pDel, bool bDel ) // may be called when the key has changed. - ////////////////////////// class AvlIterator // The iterator walks through a tree one entry by one. diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 9bd8411ef850..91d395d9367d 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -315,7 +315,6 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr // XNameContainer - void SAL_CALL OLESimpleStorage::insertByName( const OUString& aName, const uno::Any& aElement ) throw ( lang::IllegalArgumentException, container::ElementExistException, @@ -628,7 +627,6 @@ sal_Bool SAL_CALL OLESimpleStorage::hasElements() // XComponent - void SAL_CALL OLESimpleStorage::dispose() throw ( uno::RuntimeException, std::exception ) { @@ -686,7 +684,6 @@ void SAL_CALL OLESimpleStorage::removeEventListener( // XTransactedObject - void SAL_CALL OLESimpleStorage::commit() throw ( css::io::IOException, css::lang::WrappedTargetException, diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 4e7f374268ae..0008a521a951 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -322,7 +322,6 @@ public: }; - class SmShowSymbol : public Control { Link<SmShowSymbol&,void> aDblClickHdlLink; @@ -345,7 +344,6 @@ public: }; - class SmSymDefineDialog; class SmSymbolDialog : public ModalDialog @@ -390,7 +388,6 @@ public: }; - class SmShowChar : public Control { virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; @@ -407,7 +404,6 @@ public: }; - class SmSymDefineDialog : public ModalDialog { VclPtr<ComboBox> pOldSymbols; @@ -507,7 +503,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 9a94f0115982..f70a9203bf82 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -67,7 +67,6 @@ class SmDocShell; class EditEngine; - class SmPrinterAccess { VclPtr<Printer> pPrinter; @@ -80,12 +79,9 @@ public: }; - - void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool); - class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener { friend class SmPrinterAccess; @@ -107,7 +103,6 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener std::set< OUString > aUsedSymbols; // to export used symbols only when saving - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; bool WriteAsMathType3( SfxMedium& ); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index f07687ac05f5..28becba19c89 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -87,9 +87,6 @@ enum SmNodeType }; - - - class SmNode : public SmRect { SmFace maFace; @@ -229,7 +226,6 @@ private: }; - /** A simple auxiliary iterator class for SmNode * * Example of iteration over children of pMyNode: @@ -288,7 +284,6 @@ private: }; - /** Abstract baseclass for all composite node * * Subclasses of this class can have subnodes. Nodes that doesn't derivate from @@ -363,9 +358,6 @@ public: }; - - - class SmGraphicNode : public SmVisibleNode { protected: @@ -379,8 +371,6 @@ public: }; - - /** Draws a rectangle * * Used for drawing the line in the OVER and OVERSTRIKE commands. @@ -404,8 +394,6 @@ public: }; - - /** Polygon line node * * Used to draw the slash of the WIDESLASH command by SmBinDiagonalNode. @@ -431,8 +419,6 @@ public: }; - - /** Text node * * @remarks This class also serves as baseclass for all nodes that contains text. @@ -496,8 +482,6 @@ public: }; - - /** Special node for user defined characters * * Node used for pre- and user-defined characters from: @@ -522,8 +506,6 @@ public: }; - - /** Glyph node for custom operators * * This node is used with commands: oper, uoper and boper. @@ -545,8 +527,6 @@ public: }; - - /** Math symbol node * * Use for math symbols such as plus, minus and integrale in the INT command. @@ -575,7 +555,6 @@ public: }; - /** Math Identifier * * This behaves essentially the same as SmMathSymbolNode and is only used to @@ -590,7 +569,6 @@ public: }; - /** Root symbol node * * Root symbol node used by SmRootNode to create the root symbol, in front of @@ -639,8 +617,6 @@ public: }; - - /** Place node * * Used to create the <?> command, that denotes place where something can be @@ -662,8 +638,6 @@ public: }; - - /** Error node, for parsing errors * * This node is used for parsing errors and draws an questionmark turned upside @@ -684,8 +658,6 @@ public: }; - - /** Table node * * This is the root node for the formula tree. This node is also used for the @@ -713,8 +685,6 @@ public: }; - - /** A line * * Used as child of SmTableNode when the SmTableNode is the root node of the @@ -747,8 +717,6 @@ public: }; - - /** Expression node * * Used whenever you have an expression such as "A OVER {B + C}", here there is @@ -768,8 +736,6 @@ public: }; - - /** Unary horizontal node * * The same as SmBinHorNode except this is for unary operators. @@ -788,8 +754,6 @@ public: }; - - /** Root node * * Used for create square roots and other roots, example: @@ -856,8 +820,6 @@ public: }; - - /** Binary horizontal node * * This node is used for binary operators. In a formula such as "A + B". @@ -890,8 +852,6 @@ public: }; - - /** Binary horizontal node * * This node is used for creating the OVER command, consider the formula: @@ -922,8 +882,6 @@ public: }; - - /** Binary diagonal node * * Used for implementing the WIDESLASH command, example: "A WIDESLASH B". @@ -952,9 +910,6 @@ public: }; - - - /** Enum used to index sub-/supscripts in the 'aSubNodes' array * in 'SmSubSupNode' * @@ -1035,8 +990,6 @@ public: }; - - /** Node for brace construction * * Used for "lbrace [body] rbrace" and similar constructions. @@ -1072,8 +1025,6 @@ public: }; - - /** Body of an SmBraceNode * * This usually only has one child an SmExpressionNode, however, it can also @@ -1103,8 +1054,6 @@ inline SmBracebodyNode::SmBracebodyNode(const SmToken &rNodeToken) : } - - /** Node for vertical brace construction * * Used to implement commands "[body] underbrace [script]" and @@ -1141,9 +1090,6 @@ inline SmVerticalBraceNode::SmVerticalBraceNode(const SmToken &rNodeToken) : } - - - /** Operation Node * * Used for commands like SUM, INT and similar. @@ -1176,8 +1122,6 @@ public: }; - - /** Node used for alignment * * This node has exactly one child at index 0. @@ -1194,8 +1138,6 @@ public: }; - - /** Attribute node * * Used to give an attribute to another node. Used for commands such as: @@ -1224,8 +1166,6 @@ public: }; - - /** Font node * * Used to change the font of its children. @@ -1254,8 +1194,6 @@ public: }; - - /** Matrix node * * Used to implement the MATRIX command, example: @@ -1286,8 +1224,6 @@ public: }; - - /** Node for whitespace * * Used to implement the "~" command. This node is just a blank space. @@ -1314,9 +1250,6 @@ public: }; - - - inline SmNode* SmRootNode::Argument() { OSL_ASSERT( GetNumSubNodes() > 0 ); @@ -1346,7 +1279,6 @@ inline const SmNode* SmRootNode::Body() const } - inline SmDynIntegralSymbolNode* SmDynIntegralNode::Symbol() { OSL_ASSERT( GetNumSubNodes() > 0 && GetSubNode( 0 )->GetType() == NDYNINTSYMBOL ); diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index ac7e99d2e5ee..fb6063e91d97 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -43,7 +43,6 @@ inline long SmFromTo(long nFrom, long nTo, double fRelDist) } - // SmRect // ... (to be done) // This Implementation assumes that the x-axis points to the right and the diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 4a53375063f3..4397edacacbe 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -54,7 +54,6 @@ class SvtSysLocale; class VirtualDevice; - class SmResId : public ResId { public: diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index 475515fe6514..f73d15617ab7 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -37,8 +37,6 @@ #define SYMBOL_NONE 0xFFFF - - inline const OUString GetUiSymbolName( const OUString &rExportSymbolName ) { return SmLocalizedSymbolData::GetUiSymbolName( rExportSymbolName ); @@ -56,7 +54,6 @@ inline const OUString GetUiSymbolSetName( const OUString &rExportSymbolSetName ) } - class SmSym { private: diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index cd8be00162b4..73b26fefcecd 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -24,11 +24,9 @@ #define FONTNAME_MATH "OpenSymbol" - enum SmPrintSize { PRINT_SIZE_NORMAL, PRINT_SIZE_SCALED, PRINT_SIZE_ZOOMED }; - inline bool IsInPrivateUseArea( sal_Unicode cChar ) { return 0xE000 <= cChar && cChar <= 0xF8FF; } sal_Unicode ConvertMathToMathML( sal_Unicode cChar ); diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index c853806b5302..95c15d9392e7 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -45,9 +45,6 @@ public: }; - - - class SmModel : public SfxBaseModel, public comphelper::PropertySetHelper, public css::lang::XServiceInfo, @@ -101,7 +98,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 4c86f33e12e4..b8ede623b80c 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -65,8 +65,6 @@ class SmViewShell; SmViewShell * SmGetActiveView(); - - // SmFace @@ -107,8 +105,6 @@ public: SmFace & operator *= (SmFace &rFace, const Fraction &rFrac); - - // SmFontPickList @@ -142,7 +138,6 @@ public: }; - // SmFontPickListBox diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 2e81b188d5e7..7eb5eb56085d 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -66,7 +66,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::accessibility; - static awt::Rectangle lcl_GetBounds( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::implGetBounds() @@ -109,7 +108,6 @@ static awt::Point lcl_GetLocationOnScreen( vcl::Window *pWin ) } - SmGraphicAccessible::SmGraphicAccessible( SmGraphicWindow *pGraphicWin ) : aAccName (SM_RESSTR(RID_DOCUMENTSTR)), nClientId (0), @@ -795,9 +793,6 @@ Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames() } - - - SmEditSource::SmEditSource( SmEditWindow * /*pWin*/, SmEditAccessible &rAcc ) : aViewFwd (rAcc), aTextFwd (rAcc, *this), @@ -926,8 +921,6 @@ Point SmViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod } - - SmTextForwarder::SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource) : rEditAcc ( rAcc ), rEditSource (rSource) @@ -1459,7 +1452,6 @@ void SmTextForwarder::CopyText(const SvxTextForwarder& rSource) } - SmEditViewForwarder::SmEditViewForwarder( SmEditAccessible& rAcc ) : rEditAcc( rAcc ) { @@ -1598,7 +1590,6 @@ bool SmEditViewForwarder::Paste() } - SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) : aAccName (SM_RESSTR(STR_CMDBOXWINDOW)), pTextHelper (nullptr), @@ -1925,5 +1916,4 @@ Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index c4cd3c32177b..61114c1e0f3d 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -47,7 +47,6 @@ struct AccessibleEventObject; }}}} - // classes and helper-classes used for accessibility in the graphic-window @@ -145,7 +144,6 @@ public: }; - // classes and helper-classes used for accessibility in the command-window @@ -297,8 +295,6 @@ public: }; - - typedef cppu::WeakImplHelper < @@ -371,7 +367,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index d6c91b76cb8a..e987b664e0e8 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -145,8 +145,6 @@ SmCfgOther::SmCfgOther() } - - SmFontFormat::SmFontFormat() { aName = FONTNAME_MATH; @@ -193,8 +191,6 @@ bool SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const } - - SmFntFmtListEntry::SmFntFmtListEntry( const OUString &rId, const SmFontFormat &rFntFmt ) : aId (rId), aFntFmt (rFntFmt) @@ -266,7 +262,6 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( const OUString &rFntFmtId } - const SmFontFormat * SmFontFormatList::GetFontFormat( size_t nPos ) const { const SmFontFormat *pRes = nullptr; @@ -332,7 +327,6 @@ const OUString SmFontFormatList::GetNewFontFormatId() const } - SmMathConfig::SmMathConfig() : ConfigItem(OUString(aRootName)) , pFormat() diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx index 54fca7ec2371..2abbfced833a 100644 --- a/starmath/source/detreg.cxx +++ b/starmath/source/detreg.cxx @@ -68,5 +68,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL smd_component_getFactory( const sal_Char* pI } // extern "C" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 6a97fba67d6d..04656de72863 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1438,8 +1438,6 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol) } - - void SmSymbolDialog::FillSymbolSets(bool bDeleteText) // populate the entries of possible SymbolsSets in the dialog with // current values of the SymbolSet manager but selects none of those diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 63dbfbe07e37..9e2a745c46ef 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -785,7 +785,6 @@ bool SmDocShell::Load( SfxMedium& rMedium ) } - bool SmDocShell::Save() { //! apply latest changes if necessary diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 203740a7b3fa..62deaa898786 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -59,8 +59,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; - - void SmGetLeftSelectionPart(const ESelection &rSel, sal_Int32 &nPara, sal_uInt16 &nPos) // returns paragraph number and position of the selections left part @@ -84,7 +82,6 @@ bool SmEditWindow::IsInlineEditEnabled() } - SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) : Window (&rMyCmdBoxWin), DropTargetHelper ( this ), diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index ed7c0044ce5c..63e9d090dcc9 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -21,9 +21,6 @@ #include <sot/storage.hxx> - - - bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) { sal_uInt8 nVer = 0; @@ -53,5 +50,4 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 94222820af1d..44dcd38aed22 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -23,7 +23,6 @@ #include "format.hxx" - // Latin default-fonts static const DefaultFontType aLatinDefFnts[FNT_END] = { @@ -94,7 +93,6 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) } - SmFormat::SmFormat() : aBaseSize(0, SmPtsTo100th_mm(12)) { diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 44e9c5782568..f78b6f23b00a 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -36,8 +36,6 @@ namespace com { namespace sun { namespace star { } } } - - class SmXMLExportWrapper { css::uno::Reference<css::frame::XModel> xModel; @@ -67,7 +65,6 @@ public: }; - class SmXMLExport : public SvXMLExport { const SmNode * pTree; @@ -118,7 +115,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 3e983078aaa5..591a81819480 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -392,7 +392,6 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent( } - SmXMLImport::SmXMLImport( const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlags) @@ -430,7 +429,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance( } - OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisMetaImporter" ); @@ -450,7 +448,6 @@ throw( uno::Exception ) } - OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisSettingsImporter" ); @@ -525,7 +522,6 @@ void SmXMLImport::endDocument() } - class SmXMLImportContext: public SvXMLImportContext { public: @@ -569,7 +565,6 @@ SvXMLImportContext * SmXMLImportContext::CreateChildContext(sal_uInt16 /*nPrefix } - struct SmXMLContext_Helper { sal_Int8 nIsBold; @@ -743,7 +738,6 @@ void SmXMLContext_Helper::ApplyAttrs() } - class SmXMLDocContext_Impl : public SmXMLImportContext { public: @@ -757,7 +751,6 @@ public: }; - /*avert thy gaze from the proginator*/ class SmXMLRowContext_Impl : public SmXMLDocContext_Impl { @@ -780,7 +773,6 @@ public: }; - class SmXMLEncloseContext_Impl : public SmXMLRowContext_Impl { public: @@ -805,7 +797,6 @@ void SmXMLEncloseContext_Impl::EndElement() } - class SmXMLFracContext_Impl : public SmXMLRowContext_Impl { public: @@ -818,7 +809,6 @@ public: }; - class SmXMLSqrtContext_Impl : public SmXMLRowContext_Impl { public: @@ -830,7 +820,6 @@ public: }; - class SmXMLRootContext_Impl : public SmXMLRowContext_Impl { public: @@ -842,7 +831,6 @@ public: }; - class SmXMLStyleContext_Impl : public SmXMLRowContext_Impl { protected: @@ -879,7 +867,6 @@ void SmXMLStyleContext_Impl::EndElement() } - class SmXMLPaddedContext_Impl : public SmXMLRowContext_Impl { public: @@ -903,7 +890,6 @@ void SmXMLPaddedContext_Impl::EndElement() } - class SmXMLPhantomContext_Impl : public SmXMLRowContext_Impl { public: @@ -937,7 +923,6 @@ void SmXMLPhantomContext_Impl::EndElement() } - class SmXMLFencedContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1032,8 +1017,6 @@ void SmXMLFencedContext_Impl::EndElement() } - - class SmXMLErrorContext_Impl : public SmXMLRowContext_Impl { public: @@ -1061,7 +1044,6 @@ void SmXMLErrorContext_Impl::EndElement() } - class SmXMLNumberContext_Impl : public SmXMLImportContext { protected: @@ -1093,7 +1075,6 @@ void SmXMLNumberContext_Impl::EndElement() } - class SmXMLAnnotationContext_Impl : public SmXMLImportContext { bool bIsStarMath; @@ -1140,7 +1121,6 @@ void SmXMLAnnotationContext_Impl::Characters(const OUString &rChars) } - class SmXMLTextContext_Impl : public SmXMLImportContext { protected: @@ -1172,7 +1152,6 @@ void SmXMLTextContext_Impl::EndElement() } - class SmXMLStringContext_Impl : public SmXMLImportContext { protected: @@ -1214,7 +1193,6 @@ void SmXMLStringContext_Impl::EndElement() } - class SmXMLIdentifierContext_Impl : public SmXMLImportContext { protected: @@ -1278,7 +1256,6 @@ void SmXMLIdentifierContext_Impl::TCharacters(const OUString &rChars) } - class SmXMLOperatorContext_Impl : public SmXMLImportContext { bool bIsStretchy; @@ -1317,7 +1294,6 @@ void SmXMLOperatorContext_Impl::EndElement() } - void SmXMLOperatorContext_Impl::StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -1345,8 +1321,6 @@ void SmXMLOperatorContext_Impl::StartElement(const uno::Reference< } - - class SmXMLSpaceContext_Impl : public SmXMLImportContext { public: @@ -1372,7 +1346,6 @@ void SmXMLSpaceContext_Impl::StartElement( } - class SmXMLSubContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1417,7 +1390,6 @@ void SmXMLSubContext_Impl::GenericEndElement(SmTokenType eType, SmSubSup eSubSup } - class SmXMLSupContext_Impl : public SmXMLSubContext_Impl { public: @@ -1432,7 +1404,6 @@ public: }; - class SmXMLSubSupContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1478,7 +1449,6 @@ void SmXMLSubSupContext_Impl::GenericEndElement(SmTokenType eType, } - class SmXMLUnderContext_Impl : public SmXMLSubContext_Impl { protected: @@ -1545,7 +1515,6 @@ void SmXMLUnderContext_Impl::EndElement() } - class SmXMLOverContext_Impl : public SmXMLSubContext_Impl { protected: @@ -1603,7 +1572,6 @@ void SmXMLOverContext_Impl::HandleAccent() } - class SmXMLUnderOverContext_Impl : public SmXMLSubSupContext_Impl { public: @@ -1618,7 +1586,6 @@ public: }; - class SmXMLMultiScriptsContext_Impl : public SmXMLSubSupContext_Impl { bool bHasPrescripts; @@ -1638,7 +1605,6 @@ public: }; - class SmXMLNoneContext_Impl : public SmXMLImportContext { public: @@ -1662,7 +1628,6 @@ void SmXMLNoneContext_Impl::EndElement() } - class SmXMLPrescriptsContext_Impl : public SmXMLImportContext { public: @@ -1672,7 +1637,6 @@ public: }; - class SmXMLTableRowContext_Impl : public SmXMLRowContext_Impl { public: @@ -1687,8 +1651,6 @@ public: }; - - class SmXMLTableContext_Impl : public SmXMLTableRowContext_Impl { public: @@ -1704,8 +1666,6 @@ public: }; - - class SmXMLTableCellContext_Impl : public SmXMLRowContext_Impl { public: @@ -1716,7 +1676,6 @@ public: }; - class SmXMLAlignGroupContext_Impl : public SmXMLRowContext_Impl { public: @@ -1732,7 +1691,6 @@ public: }; - class SmXMLActionContext_Impl : public SmXMLRowContext_Impl { size_t mnSelection; // 1-based @@ -1749,7 +1707,6 @@ public: }; - // NB: virtually inherit so we can multiply inherit properly // in SmXMLFlatDocContext_Impl class SmXMLOfficeContext_Impl : public virtual SvXMLImportContext @@ -1786,7 +1743,6 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref } - // context for flat file xml format class SmXMLFlatDocContext_Impl : public SmXMLOfficeContext_Impl, public SvXMLMetaDocumentContext @@ -1834,7 +1790,6 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext( } - static const SvXMLTokenMapEntry aPresLayoutElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS }, @@ -2991,7 +2946,4 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 961efadd8530..bef17d24ed2a 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star { } } } - class SmXMLImportWrapper { css::uno::Reference<css::frame::XModel> xModel; @@ -67,7 +66,6 @@ public: }; - class SmXMLImport : public SvXMLImport { std::unique_ptr<SvXMLTokenMap> pPresLayoutElemTokenMap; @@ -254,7 +252,6 @@ public: }; - enum SmXMLMathElemTokenMap { XML_TOK_MATH diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index dc021cb6c06b..1bf881415cbd 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -519,7 +519,6 @@ long SmNode::GetFormulaBaseline() const } - SmStructureNode::SmStructureNode( const SmStructureNode &rNode ) : SmNode( rNode.GetType(), rNode.GetToken() ) { @@ -1022,7 +1021,6 @@ void SmDynIntegralNode::CreateTextFromNode(OUString &rText) } - /**************************************************************************/ diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index dded5750985d..024dd8cf05f1 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -62,8 +62,6 @@ SmToken::SmToken(SmTokenType eTokenType, } - - static const SmTokenTableEntry aTokenTable[] = { { "Im" , TIM, MS_IM, TGSTANDALONE, 5 }, @@ -314,8 +312,6 @@ const SmTokenTableEntry * SmParser::GetTokenTableEntry( const OUString &rName ) } - - #if OSL_DEBUG_LEVEL > 1 static const sal_Unicode aDelimiterTable[] = diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index a0c8c67058f6..1e69966e151a 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -31,7 +31,6 @@ - // '\0' terminated Array with symbol, which should be treat as letters in // StarMath Font, (to get a normal (non-clipped) SmRect in contrast to the // other operators and symbols). @@ -71,12 +70,9 @@ bool SmIsMathAlpha(const OUString &rText) } - - // SmRect members - SmRect::SmRect() // constructs empty rectangle at (0, 0) with width and height 0. { diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx index f28171060fd1..237bb4acb16f 100644 --- a/starmath/source/register.cxx +++ b/starmath/source/register.cxx @@ -94,5 +94,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory( const sal_Char* pIm } // extern "C" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 0ba1e2c2d49d..403597daf23e 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -46,14 +46,12 @@ #include <svx/xmlsecctrl.hxx> - SmResId::SmResId( sal_uInt16 nId ) : ResId(nId, *SM_MOD()->GetResMgr()) { } - SmLocalizedSymbolData::SmLocalizedSymbolData() : Resource( SmResId(RID_LOCALIZED_NAMES) ), aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ), diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index e9a1bd90e04a..aaa5b01358b7 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -31,5 +31,4 @@ #include "smslots.hxx" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 32ef68f5fb6b..41ffd321941a 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -152,8 +152,6 @@ SmPrintUIOptions::SmPrintUIOptions() } - - // class SmModel @@ -926,7 +924,6 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu } - sal_Int32 SAL_CALL SmModel::getRendererCount( const uno::Any& /*rSelection*/, const uno::Sequence< beans::PropertyValue >& /*xOptions*/ ) diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 39b04440402b..6ac33fc2ce26 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -33,8 +33,6 @@ #include "smdll.hxx" - - // return pointer to active SmViewShell, if this is not possible // return 0 instead. //!! Since this method is based on the current focus it is somewhat @@ -46,9 +44,6 @@ SmViewShell * SmGetActiveView() } - - - /**************************************************************************/ void SmFontPickList::Clear() @@ -220,7 +215,6 @@ void SmFontPickListBox::Remove(const vcl::Font &rFont) } - bool IsItalic( const vcl::Font &rFont ) { FontItalic eItalic = rFont.GetItalic(); @@ -291,5 +285,4 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx index f74620bdbc5c..d3dcacf366bd 100644 --- a/stoc/source/corereflection/crbase.cxx +++ b/stoc/source/corereflection/crbase.cxx @@ -228,12 +228,6 @@ Reference< XIdlArray > IdlClassImpl::getArray() } - - - - - - IdlMemberImpl::IdlMemberImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName, typelib_TypeDescription * pTypeDescr, typelib_TypeDescription * pDeclTypeDescr ) diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index 6bf3f72092ca..7e1eeab99607 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -275,11 +275,6 @@ void IdlCompFieldImpl::set( Any & rObj, const Any & rValue ) } - - - - - CompoundIdlClassImpl::~CompoundIdlClassImpl() { delete _pFields; diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index 5003574629e4..21d4159c63da 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -168,11 +168,6 @@ void IdlEnumFieldImpl::set( Any &, const Any & ) } - - - - - EnumIdlClassImpl::~EnumIdlClassImpl() { delete _pFields; diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index de8e73c959c1..16fa4060ef8b 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -324,11 +324,6 @@ void IdlAttributeFieldImpl::checkException( } - - - - - class IdlInterfaceMethodImpl : public IdlMemberImpl , public XIdlMethod @@ -763,12 +758,6 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & } - - - - - - InterfaceIdlClassImpl::~InterfaceIdlClassImpl() { for ( sal_Int32 nPos = _nMethods + _nAttributes; nPos--; ) diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index c57b8c8e4eb8..e9c36eeea929 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -145,7 +145,6 @@ protected: }; - NestedKeyImpl::NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry, Reference<XRegistryKey>& localKey, Reference<XRegistryKey>& defaultKey ) @@ -1106,7 +1105,6 @@ OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName ) } - // DefaultRegistry Implementation @@ -1179,8 +1177,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException, s } - - OUString SAL_CALL NestedRegistryImpl::getImplementationName( ) throw(RuntimeException, std::exception) { diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index d15e4ee0d9b4..c95159bb7a7f 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -479,7 +479,6 @@ static void deletePathIfPossible(const Reference < XRegistryKey >& xRootKey, } - // static deleteUserLink static void deleteUserLink(const Reference < XRegistryKey >& xRootKey, @@ -1028,7 +1027,6 @@ static void insert_singletons( } - // static prepareRegistry static void prepareRegistry( @@ -1328,7 +1326,6 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM } - // XInitialization void ImplementationRegistration::initialize( @@ -1418,8 +1415,6 @@ void ImplementationRegistration::initialize( } - - // virtual function registerImplementationWithLocation of XImplementationRegistration2 void ImplementationRegistration::registerImplementationWithLocation( @@ -1536,7 +1531,6 @@ void ImplementationRegistration::registerImplementation( } - // virtual function revokeImplementation of XImplementationRegistration sal_Bool ImplementationRegistration::revokeImplementation(const OUString& location, @@ -1774,7 +1768,6 @@ void ImplementationRegistration::doRegister( } - Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRegistry( const Reference< XMultiComponentFactory > &rSMgr, const Reference < XComponentContext > & xCtx) diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 9f43c8c6fbe8..9483a1482b6e 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -90,8 +90,6 @@ typedef WeakImplHelper< XIntrospectionAccess, XMaterialHolder, XExactName, XIdlArray, XUnoTunnel > IntrospectionAccessHelper; - - // Special value for Method-Concept, to be able to mark "normal" functions #define MethodConcept_NORMAL_IMPL 0x80000000 @@ -117,7 +115,6 @@ bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> xDer } - // *** Classification of Properties (no enum, to be able to use Sequence) *** // Properties from a PropertySet-Interface #define MAP_PROPERTY_SET 0 @@ -133,8 +130,6 @@ bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> xDer #define ARRAY_SIZE_STEP 20 - - //*** IntrospectionAccessStatic_Impl *** // Equals to the old IntrospectionAccessImpl, forms now a static @@ -689,7 +684,6 @@ void IntrospectionAccessStatic_Impl::checkInterfaceArraySize( Sequence< Referenc } - //*** ImplIntrospectionAccess *** @@ -1102,7 +1096,6 @@ Any SAL_CALL ImplIntrospectionAccess::queryInterface( const Type& rType ) } - //*** Implementation of ImplIntrospectionAdapter *** @@ -1990,7 +1983,6 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect( } - // 3. Methods // Counter for found listeners @@ -2381,8 +2373,6 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect( } - - // 4. Place methods in overall sequence // How many methods in the method sequence diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index acb08095ffec..5d57fd6ff83b 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -85,7 +85,6 @@ inline Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< } - class Invocation_Impl : public OWeakObject , public XInvocation2 @@ -199,7 +198,6 @@ public: virtual OUString SAL_CALL getExactName( const OUString& rApproximateName ) throw( RuntimeException, std::exception ) override; - private: void setMaterial( const Any& rMaterial ); @@ -234,11 +232,6 @@ private: }; - - - - - Invocation_Impl::Invocation_Impl ( const Any & rAdapted, @@ -259,7 +252,6 @@ Invocation_Impl::~Invocation_Impl() {} //### INTERFACE IMPLEMENTATIONS #################################################################### - Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) throw( RuntimeException, std::exception ) { @@ -341,7 +333,6 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) } - Any Invocation_Impl::getMaterial() throw(RuntimeException, std::exception) { // AB, 12.2.1999 Make sure that the material is taken when possible @@ -732,7 +723,6 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& } - // Struct to optimize sorting struct MemberItem { @@ -1081,8 +1071,6 @@ Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) throw( Ru } - - class InvocationService : public WeakImplHelper< XSingleServiceFactory, XServiceInfo > { @@ -1163,7 +1151,6 @@ Reference<XInterface> InvocationService::createInstanceWithArguments( } - Reference<XInterface> SAL_CALL InvocationService_CreateInstance( const Reference<XComponentContext> & xCtx ) throw( RuntimeException ) { diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 081f10636477..4ed0b8f2d073 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -905,10 +905,6 @@ static Reference< XInterface > SAL_CALL FactoryImpl_create( } - - - - static const struct ::cppu::ImplementationEntry g_entries[] = { { diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 7017956520c4..6355db4ad10b 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -320,7 +320,6 @@ Sequence<OUString> SAL_CALL JavaComponentLoader::getSupportedServiceNames() } - // XImplementationLoader sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo( const css::uno::Reference<XRegistryKey> & xKey, const OUString & blabla, diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 0062ef1e0922..ecbe66ba7430 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -144,7 +144,6 @@ Reference<XInterface> SAL_CALL DllComponentLoader::activate( } - sal_Bool SAL_CALL DllComponentLoader::writeRegistryInfo( const Reference< XRegistryKey > & xKey, const OUString &, const OUString & rLibName ) diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index bafd2f27eda9..2ce250ba17e2 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -393,8 +393,6 @@ Any ProxyRoot::queryAggregation( Type const & rType ) } - - FactoryImpl::FactoryImpl() { OUString uno = UNO_LB_UNO; diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 31bac05019a9..b5966bb23f32 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -67,7 +67,6 @@ static OUString s_envType = CPPU_CURRENT_LANGUAGE_BINDING_NAME; const char s_acRestriction[] = "access-control.restriction"; - /** ac context intersects permissions of two ac contexts */ class acc_Intersection @@ -259,7 +258,6 @@ Any acc_CurrentContext::getValueByName( OUString const & name ) } - static inline Reference< security::XAccessControlContext > getDynamicRestriction( Reference< XCurrentContext > const & xContext ) { @@ -523,7 +521,6 @@ static void dumpPermissions( #endif - inline void AccessController::clearPostPoned() { delete static_cast< t_rec_vec * >( m_rec.getData() ); diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 77f99b79fe7b..57030fba53cf 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -102,8 +102,6 @@ static inline OUString makeStrings( } - - class SocketPermission : public Permission { static char const * s_actions []; @@ -271,8 +269,6 @@ OUString SocketPermission::toString() const } - - class FilePermission : public Permission { static char const * s_actions []; @@ -424,8 +420,6 @@ OUString FilePermission::toString() const } - - class RuntimePermission : public Permission { OUString m_name; @@ -462,8 +456,6 @@ OUString RuntimePermission::toString() const } - - bool AllPermission::implies( Permission const & ) const { return true; @@ -475,8 +467,6 @@ OUString AllPermission::toString() const } - - PermissionCollection::PermissionCollection( Sequence< Any > const & permissions, PermissionCollection const & addition ) : m_head( addition.m_head ) diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 1fdf14f19a31..426dabe6fde3 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -467,7 +467,6 @@ private: }; - inline bool OServiceManager::is_disposed() const { // ought to be guarded by m_mutex: @@ -486,9 +485,6 @@ inline void OServiceManager::check_undisposed() const } - - - typedef WeakComponentImplHelper< lang::XMultiServiceFactory, lang::XMultiComponentFactory, lang::XServiceInfo, container::XSet, container::XContentEnumerationAccess, @@ -660,9 +656,6 @@ OServiceManagerWrapper::OServiceManagerWrapper( } - - - /** * Create a ServiceManager */ diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 9ee51a6e3fad..d952852afdc2 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -80,7 +80,6 @@ static inline double unsigned_int64_to_double( sal_uInt64 n ) #endif - static inline double round( double aVal ) { bool bPos = (aVal >= 0.0); diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx index 76a7d29c5257..827a93cfb63e 100644 --- a/stoc/test/javavm/testjavavm.cxx +++ b/stoc/test/javavm/testjavavm.cxx @@ -43,7 +43,6 @@ using namespace css::registry; using namespace css::java; - sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr ) { diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index 786e8d35966c..d78e77b01db4 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -261,7 +261,6 @@ static sal_Bool convertTo( const Type & rDestType, const Any & rVal, sal_Bool bE } - typedef struct _ConvBlock { Any _value; @@ -287,7 +286,6 @@ typedef struct _ConvBlock } ConvBlock; - static sal_Int32 initBlocks( ConvBlock * pTestBlocks ) { Any aVal; diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx index 3d875b94efc7..e04519c2ba84 100644 --- a/stoc/test/testcorefl.cxx +++ b/stoc/test/testcorefl.cxx @@ -59,7 +59,6 @@ using namespace css::reflection; using namespace css::container; - class OInterfaceA : public WeakImplHelper< XInterfaceA > { public: diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx index 3452e68bc393..54c260e4fef4 100644 --- a/stoc/test/testiadapter.cxx +++ b/stoc/test/testiadapter.cxx @@ -49,8 +49,6 @@ using namespace css::reflection; using namespace css::registry; - - sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 ) { OSL_ENSURE( rData1.Bool == rData2.Bool, "### bool does not match!" ); @@ -666,8 +664,6 @@ sal_Bool XLB_Invocation::hasProperty( const OUString & rName ) } - - void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Int16 nShort, sal_uInt16 nUShort, sal_Int32 nLong, sal_uInt32 nULong, diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index a3f694bb3bfc..49fac8c4d932 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -52,7 +52,6 @@ using namespace css::container; using namespace css::beans::PropertyAttribute; - #define DEFAULT_INDEX_ACCESS_COUNT 10 #define DEFAULT_NAME_ACCESS_COUNT 5 @@ -659,7 +658,6 @@ void ImplIntroTest::removePropertiesChangeListener } - struct DefItem { char const * pName; @@ -839,7 +837,6 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr, OString aErrorStr; - // create test object Any aObjAny = getIntrospectionTestObject( xMgr ); diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx index 9505d7ca32bd..83bda7ff321f 100644 --- a/stoc/test/testproxyfac.cxx +++ b/stoc/test/testproxyfac.cxx @@ -97,7 +97,6 @@ Any TargetObject::queryInterface( Type const & type ) int TargetObject::s_obj = 0; - class TestMaster : public WeakImplHelper< lang::XServiceInfo > { Reference< XAggregation > m_xProxyTarget; diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index 8540061650f5..91c2db508d6b 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -60,7 +60,6 @@ using namespace osl; using namespace cppu; - Reference<XMultiServiceFactory> getProcessServiceManager() { Reference<XMultiServiceFactory > s_x; @@ -115,7 +114,6 @@ Reference< XInterface > SAL_CALL Test_Manager_Impl_CreateInstance_Impl() } - // Test_Manager_Impl_CreateInstance() Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance( @@ -127,7 +125,6 @@ Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance( } - // Test_Manager_Impl::getImplementationName OUString Test_Manager_Impl::getImplementationName() throw() @@ -161,8 +158,6 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static() throw } - - /**** * * @@ -257,7 +252,6 @@ extern "C" void SAL_CALL test_ServiceManager() } - extern "C" { @@ -313,5 +307,4 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx index e37145e4dddc..8e9d4eb27c7b 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx @@ -78,7 +78,6 @@ namespace svgio } // end of namespace svgio - namespace svgio { namespace svgreader @@ -127,7 +126,6 @@ namespace svgio } // end of namespace svgio - namespace svgio { namespace svgreader diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx index 3d0dbf5cd999..de116e6c9aa3 100644 --- a/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgnode.hxx @@ -40,7 +40,6 @@ namespace svgio } - namespace svgio { namespace svgreader diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx index 828bfb160e9e..608aa49348b8 100644 --- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx +++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx @@ -35,7 +35,6 @@ namespace svgio { namespace svgreader { }} - namespace svgio { namespace svgreader diff --git a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx index 97c95fea4d25..26e737c24b1a 100644 --- a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx @@ -22,7 +22,6 @@ #include <svgio/svgreader/svgnode.hxx> - namespace svgio { namespace svgreader @@ -50,7 +49,6 @@ namespace svgio } // end of namespace svgio - #endif // INCLUDED_SVGIO_INC_SVGIO_SVGREADER_SVGTITLEDESCNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 8951c3117cac..ab89025d3a0d 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -150,7 +150,6 @@ namespace svgio } // end of namespace svgio - namespace svgio { namespace svgreader @@ -195,7 +194,6 @@ namespace svgio } // end of namespace svgio - namespace svgio { namespace svgreader @@ -584,7 +582,6 @@ namespace svgio } // end of namespace svgio - namespace svgio { namespace svgreader diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx index 05f6d4146343..e35a5713a76e 100644 --- a/svgio/source/svgreader/svgdocumenthandler.cxx +++ b/svgio/source/svgreader/svgdocumenthandler.cxx @@ -129,7 +129,6 @@ namespace } - namespace svgio { namespace svgreader diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index fc2a0a2fc9bf..ab53ba73fefa 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -241,7 +241,6 @@ namespace svgio } // end of namespace svgio - namespace svgio { namespace svgreader diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx index d98cf2abba58..de34e2790c72 100644 --- a/svgio/source/svgreader/svgtitledescnode.cxx +++ b/svgio/source/svgreader/svgtitledescnode.cxx @@ -20,7 +20,6 @@ #include <svgio/svgreader/svgtitledescnode.hxx> - namespace svgio { namespace svgreader diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 59b82ca49692..a9b7786fc32f 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -400,7 +400,6 @@ SvtCJKOptions::SvtCJKOptions(bool bDontLoad) } - SvtCJKOptions::~SvtCJKOptions() { // Global access, must be guarded (multithreading) diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index cb9acf10cd16..e431ecf64034 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -398,7 +398,6 @@ SvtCTLOptions::SvtCTLOptions( bool bDontLoad ) } - SvtCTLOptions::~SvtCTLOptions() { // Global access, must be guarded (multithreading) diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index ec086fe2a4dc..8723c041d247 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.cxx @@ -316,5 +316,4 @@ void SAL_CALL OFSInputStreamContainer::removeEventListener( const uno::Reference } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index f5e92ec07723..6475fe9f5dcd 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -517,5 +517,4 @@ void SAL_CALL OFSStreamContainer::waitForCompletion() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index bfecda117f57..55b7101d5f9a 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -404,7 +404,6 @@ public: }; - #endif // INCLUDED_SVL_SOURCE_INC_PASSWORDCONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 10caa003bbc8..61947fac8bc0 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -182,7 +182,6 @@ struct SfxItemPool_Impl #define SFX_ITEMPOOL_REC_DEFAULTS sal_uInt16(0x0050) - /** Read in a Unicode string from a streamed byte string representation. @param rStream Some (input) stream. Its Stream/TargetCharSets must diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index f56d4045da97..2f391269007b 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -190,7 +190,6 @@ bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const } - void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue ) { sal_uInt16 nPos = GetPosByValue(nValue); diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 0bba3ae92086..b4e80bd24b42 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -30,7 +30,6 @@ #define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) ) - CntWallpaperItem::CntWallpaperItem( sal_uInt16 which ) : SfxPoolItem( which ), _nColor( COL_TRANSPARENT ), _nStyle( 0 ) { diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 587b6a04dbbc..82b779bf4384 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -33,7 +33,6 @@ // class CntContentTypeItem Implementation. - #define CONTENT_TYPE_NOT_INIT ( (INetContentType)-1 ) CntContentTypeItem::CntContentTypeItem( sal_uInt16 which, const OUString& rType ) diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 905555dcdd54..c5934897b9a2 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -23,8 +23,6 @@ #include <tools/stream.hxx> - - SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) : SfxPoolItem( nW ), nVal(nV) @@ -32,7 +30,6 @@ SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) : } - SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) : SfxPoolItem( rItem ), nVal( rItem.nVal ) @@ -40,7 +37,6 @@ SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) : } - SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const { rStream.WriteUInt16( nVal ); @@ -48,7 +44,6 @@ SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const } - bool SfxFlagItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -65,7 +60,6 @@ bool SfxFlagItem::GetPresentation } - sal_uInt8 SfxFlagItem::GetFlagCount() const { SAL_INFO("svl", "calling GetValueText(sal_uInt16) on SfxFlagItem -- override!"); @@ -73,7 +67,6 @@ sal_uInt8 SfxFlagItem::GetFlagCount() const } - SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const { SAL_INFO("svl", "calling Create() on SfxFlagItem -- override!"); @@ -81,7 +74,6 @@ SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const } - bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -89,15 +81,10 @@ bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const } - - SfxPoolItem* SfxFlagItem::Clone(SfxItemPool *) const { return new SfxFlagItem( *this ); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 793d0a79206b..783659a6159c 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -40,7 +40,6 @@ SfxGlobalNameItem::SfxGlobalNameItem() } - SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName ) : SfxPoolItem( nW ), m_aName( rName ) @@ -48,20 +47,17 @@ SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName ) } - SfxGlobalNameItem::~SfxGlobalNameItem() { } - bool SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const { return static_cast<const SfxGlobalNameItem&>(rItem).m_aName == m_aName; } - SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const { return new SfxGlobalNameItem( *this ); diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 2757ed0e0745..39a849e8436c 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -139,7 +139,6 @@ SfxPoolItem* SfxInt32Item::CreateDefault() }; - // class SfxUInt32Item diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index d8a19b9a9355..e8c1673ddeb8 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -114,14 +114,12 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( sal_uInt16 nWhich ) const } - bool SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, SfxItemPoolFlags nFlag ) const { return bool(pItemInfos[nPos]._nFlags & nFlag); } - bool SfxItemPool::IsItemFlag( sal_uInt16 nWhich, SfxItemPoolFlags nFlag ) const { for ( const SfxItemPool *pPool = this; pPool; pPool = pPool->pImp->mpSecondary ) @@ -134,14 +132,12 @@ bool SfxItemPool::IsItemFlag( sal_uInt16 nWhich, SfxItemPoolFlags nFlag ) const } - SfxBroadcaster& SfxItemPool::BC() { return pImp->aBC; } - /** * This is the regular ctor to be used for this class. * An SfxItemPool instance is initialized, which can manage Items in the @@ -195,7 +191,6 @@ SfxItemPool::SfxItemPool } - /** * Copy ctor * @@ -262,7 +257,6 @@ SfxItemPool::SfxItemPool } - void SfxItemPool::SetDefaults( SfxPoolItem **pDefaults ) { DBG_ASSERT( pDefaults, "first we ask for it, and then we don't give back..." ); @@ -350,7 +344,6 @@ void SfxItemPool::ReleaseDefaults } - SfxItemPool::~SfxItemPool() { if ( !pImp->maPoolItems.empty() && pImp->ppPoolDefaults ) @@ -393,8 +386,6 @@ void SfxItemPool::Free(SfxItemPool* pPool) } - - void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool ) { // Reset Master in attached Pools @@ -459,14 +450,12 @@ void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfos) } - SfxMapUnit SfxItemPool::GetMetric( sal_uInt16 ) const { return pImp->eDefMetric; } - void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric ) { pImp->eDefMetric = eNewMetric; @@ -478,7 +467,6 @@ const OUString& SfxItemPool::GetName() const } - bool SfxItemPool::GetPresentation ( const SfxPoolItem& rItem, @@ -492,8 +480,6 @@ bool SfxItemPool::GetPresentation } - - SfxItemPool* SfxItemPool::Clone() const { SfxItemPool *pPool = new SfxItemPool( *this ); @@ -501,7 +487,6 @@ SfxItemPool* SfxItemPool::Clone() const } - void SfxItemPool::Delete() { // Already deleted? @@ -589,7 +574,6 @@ void SfxItemPool::Delete() } - void SfxItemPool::SetPoolDefaultItem(const SfxPoolItem &rItem) { if ( IsInRange(rItem.Which()) ) @@ -638,7 +622,6 @@ void SfxItemPool::ResetPoolDefaultItem( sal_uInt16 nWhichId ) } - const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ) { if ( 0 == nWhich ) @@ -865,7 +848,6 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem ) } - const SfxPoolItem& SfxItemPool::GetDefaultItem( sal_uInt16 nWhich ) const { if ( !IsInRange(nWhich) ) @@ -906,8 +888,6 @@ void SfxItemPool::FreezeIdRanges() } - - void SfxItemPool::FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const { DBG_ASSERT( !pImp->mpPoolRanges, "GetFrozenRanges() would be faster!" ); @@ -976,7 +956,6 @@ sal_uInt32 SfxItemPool::GetItemCount2(sal_uInt16 nWhich) const } - sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const { if ( !IsSlot(nSlotId) ) @@ -992,7 +971,6 @@ sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const } - sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const { if ( !IsWhich(nWhich) ) @@ -1011,7 +989,6 @@ sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const } - sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const { if ( !IsSlot(nSlotId) ) @@ -1027,7 +1004,6 @@ sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const } - sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, bool bDeep ) const { if ( !IsWhich(nWhich) ) diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 4cc6d2f305d8..e4bf31789ab4 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -25,18 +25,14 @@ #include <com/sun/star/uno/Sequence.hxx> - - SfxPoolItem* SfxLockBytesItem::CreateDefault() { return new SfxLockBytesItem; } - SfxLockBytesItem::SfxLockBytesItem() { } - SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream ) : SfxPoolItem( nW ) { @@ -48,7 +44,6 @@ SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream ) } - SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem ) : SfxPoolItem( rItem ), _xVal( rItem._xVal ) @@ -56,27 +51,23 @@ SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem ) } - SfxLockBytesItem::~SfxLockBytesItem() { } - bool SfxLockBytesItem::operator==( const SfxPoolItem& rItem ) const { return static_cast<const SfxLockBytesItem&>(rItem)._xVal == _xVal; } - SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const { return new SfxLockBytesItem( *this ); } - #define MAX_BUF 32000 SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, sal_uInt16 ) const @@ -101,7 +92,6 @@ SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, sal_uInt16 ) const } - SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const { SvStream aLockBytesStream( _xVal ); diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 133a1d944bac..7681f4545f2b 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -68,7 +68,6 @@ SvxMacro& SvxMacro::operator=( const SvxMacro& rBase ) } - SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl ) { aSvxMacroTable.clear(); @@ -207,7 +206,6 @@ bool SvxMacroTableDtor::Erase(sal_uInt16 nEvent) } - bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -219,7 +217,6 @@ bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const { return new SvxMacroItem( *this ); @@ -254,14 +251,12 @@ bool SvxMacroItem::GetPresentation } - SvStream& SvxMacroItem::Store( SvStream& rStrm , sal_uInt16 ) const { return aMacroTable.Write( rStrm ); } - SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { SvxMacroItem* pAttr = new SvxMacroItem( Which() ); @@ -270,14 +265,12 @@ SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const } - void SvxMacroItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ) { aMacroTable.Insert( nEvent, rMacro); } - sal_uInt16 SvxMacroItem::GetVersion( sal_uInt16 nFileFormatVersion ) const { return SOFFICE_FILEFORMAT_31 == nFileFormatVersion diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index 5fc786e05bea..90104daef35b 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -115,5 +115,4 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, bool b } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 4edf4aade20b..e2ac305988af 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -69,7 +69,6 @@ static SfxItemKind convertUInt16ToSfxItemKind(sal_uInt16 x) } - /** * The SfxItemPool is saved to the specified Stream (together with all its * secondary Pools) using its Pool Defaults and pooled Items. @@ -881,7 +880,6 @@ bool SfxItemPool::StoreSurrogate ( SvStream& rStream, const SfxPoolItem* pItem) } - sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const { DBG_ASSERT( pItem, "no 0-Pointer Surrogate" ); @@ -1102,8 +1100,6 @@ sal_uInt16 SfxItemPool::GetNewWhich } - - bool SfxItemPool::IsInVersionsRange( sal_uInt16 nWhich ) const { return nWhich >= pImp->nVerStart && nWhich <= pImp->nVerEnd; diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 36eaac4f2f78..198cef0ee482 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -249,7 +249,6 @@ bool SfxPoolItem::HasMetrics() const } - bool SfxPoolItem::QueryValue( css::uno::Any&, sal_uInt8 ) const { OSL_FAIL("There is no implementation for QueryValue for this item!"); @@ -257,7 +256,6 @@ bool SfxPoolItem::QueryValue( css::uno::Any&, sal_uInt8 ) const } - bool SfxPoolItem::PutValue( const css::uno::Any&, sal_uInt8 ) { OSL_FAIL("There is no implementation for PutValue for this item!"); diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index e4f5c3593edb..4f1dee4a9bbf 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -39,7 +39,6 @@ SfxPointItem::SfxPointItem() } - SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) : SfxPoolItem( nW ), aVal( rVal ) @@ -47,7 +46,6 @@ SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) : } - SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -55,7 +53,6 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) : } - bool SfxPointItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -70,7 +67,6 @@ bool SfxPointItem::GetPresentation } - bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -78,14 +74,12 @@ bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SfxPointItem::Clone(SfxItemPool *) const { return new SfxPointItem( *this ); } - SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const { Point aStr; @@ -94,7 +88,6 @@ SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const } - SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const { WritePair( rStream, aVal ); @@ -102,7 +95,6 @@ SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const } - bool SfxPointItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -126,7 +118,6 @@ bool SfxPointItem::QueryValue( uno::Any& rVal, } - bool SfxPointItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { @@ -166,5 +157,4 @@ bool SfxPointItem::PutValue( const uno::Any& rVal, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index f4c95be10485..57e7827423be 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -36,7 +36,6 @@ SfxRectangleItem::SfxRectangleItem() } - SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) : SfxPoolItem( nW ), aVal( rVal ) @@ -44,7 +43,6 @@ SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) : } - SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -52,7 +50,6 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) : } - bool SfxRectangleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -70,7 +67,6 @@ bool SfxRectangleItem::GetPresentation } - bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -78,14 +74,12 @@ bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SfxRectangleItem::Clone(SfxItemPool *) const { return new SfxRectangleItem( *this ); } - SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const { Rectangle aStr; @@ -94,7 +88,6 @@ SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const } - SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const { WriteRectangle( rStream, aVal ); @@ -102,7 +95,6 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const } - bool SfxRectangleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId) const { @@ -162,5 +154,4 @@ bool SfxRectangleItem::PutValue( const css::uno::Any& rVal, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 9f5e23b97f77..79473821671f 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -29,7 +29,6 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) : } - SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) : SfxPoolItem(which), pSet(pS) @@ -38,7 +37,6 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) : } - SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) : SfxPoolItem(rCopy.Which()), pSet(rCopy.pSet->Clone(true, pPool)) @@ -46,14 +44,12 @@ SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) : } - SfxSetItem::~SfxSetItem() { delete pSet; pSet = nullptr; } - bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const { DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" ); @@ -61,7 +57,6 @@ bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const } - bool SfxSetItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, @@ -75,7 +70,6 @@ bool SfxSetItem::GetPresentation } - SvStream& SfxSetItem::Store(SvStream& rStream, sal_uInt16) const { GetItemSet().Store(rStream); diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 9cfcbfa22eea..c35a551158bb 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -197,7 +197,6 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : } - SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : SfxPoolItem ( rItem ), @@ -224,7 +223,6 @@ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : } - SvxSearchItem::~SvxSearchItem() { } @@ -236,7 +234,6 @@ SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const } - //! used below static bool operator == ( const SearchOptions& rItem1, const SearchOptions& rItem2 ) { @@ -273,7 +270,6 @@ bool SvxSearchItem::operator==( const SfxPoolItem& rItem ) const } - bool SvxSearchItem::GetPresentation ( SfxItemPresentation , @@ -466,7 +462,6 @@ bool SvxSearchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const } - bool SvxSearchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index d2665fe3fa4c..ae8727a77ed1 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -24,7 +24,6 @@ // class SfxStringItem - // virtual SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream): CntUnencodedStringItem(which) diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index a10cc04a7d66..f4d259692623 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -59,7 +59,6 @@ aDbgStyleSheetReferences; #endif - SfxStyleSheetHintExtended::SfxStyleSheetHintExtended ( sal_uInt16 nAction, // SfxStyleSheetHintId::... (see above) diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index e0157a1406b1..5f75c7d13ecd 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -129,7 +129,6 @@ inline bool SvDataPipe_Impl::isEOF() const // SvOutputStreamOpenLockBytes - // virtual ErrCode SvOutputStreamOpenLockBytes::ReadAt(sal_uInt64, void *, sal_uLong, sal_uLong*) const diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx index 183b12af9c91..4d7cceda565e 100644 --- a/svl/source/notify/hint.cxx +++ b/svl/source/notify/hint.cxx @@ -28,5 +28,4 @@ SfxHint::~SfxHint() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 52070c2c3309..369fecd07170 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -1090,5 +1090,4 @@ com_sun_star_uno_util_numbers_SvNumberFormatterServiceObject_get_implementation( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index c618c7efee6e..729574b6c677 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -305,7 +305,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index bec6b7aaa1a6..5aebe0772c3f 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -173,5 +173,4 @@ com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implement } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 078d566b2da9..26f683a83286 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -225,8 +225,6 @@ void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBro } - - SvNumberFormatterRegistry_Impl* SvNumberFormatter::pFormatterRegistry = nullptr; bool SvNumberFormatter::bCurrencyTableInitialized = false; namespace @@ -2296,7 +2294,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio } - // 0 nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_NUMBER_INT ); ImpInsertFormat( aFormatSeq[nIdx], @@ -2338,7 +2335,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_PERCENT+1 /* NF_PERCENT_DEC2 */ ); - // Currency. NO default standard option! Default is determined of locale // data default currency and format is generated if needed. aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::CURRENCY ); @@ -2397,7 +2393,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio aFormatSeq[nIdx].Default = bDefault; - // Date aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::DATE ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2508,7 +2503,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYYYMMDD /* NF_DATE_DIN_YYYYMMDD */ ); - // Time aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::TIME ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2549,7 +2543,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_TIME+6 /* NF_TIME_HH_MMSS00 */ ); - // DateTime aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::DATE_TIME ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2565,7 +2558,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_DATETIME+1 /* NF_DATETIME_SYS_DDMMYYYY_HHMMSS */ ); - // Scientific number aFormatSeq = aNumberFormatCode.getAllFormatCode( i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER ); ImpAdjustFormatCodeDefault( aFormatSeq.getArray(), aFormatSeq.getLength() ); @@ -2581,7 +2573,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_SCIENTIFIC+1 /* NF_SCIENTIFIC_000E00 */ ); - // Fraction number (no default option) i18n::NumberFormatCode aSingleFormatCode; aSingleFormatCode.Usage = i18n::KNumberFormatUsage::FRACTION_NUMBER; @@ -2608,7 +2599,6 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio CLOffset + ZF_STANDARD_FRACTION+3 /* NF_FRACTION_4 */ ); - // Week of year const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords(); aSingleFormatCode.Code = rKeyword[NF_KEY_WW]; diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index d6c1d82887fd..20e986665529 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -672,7 +672,6 @@ void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserNam } - UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) { return find( aURL, OUString(), false, aHandler ); diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 9600bcfd3e6f..e015e0a6e328 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -35,7 +35,6 @@ using ::com::sun::star::uno::Exception; - SfxRepeatTarget::~SfxRepeatTarget() { } @@ -80,7 +79,6 @@ OUString SfxUndoAction::GetComment() const } - sal_uInt16 SfxUndoAction::GetId() const { return 0; @@ -128,7 +126,6 @@ void SfxUndoAction::Repeat(SfxRepeatTarget&) } - bool SfxUndoAction::CanRepeat(SfxRepeatTarget&) const { return true; @@ -1443,15 +1440,12 @@ void SfxLinkUndoAction::Redo() } - bool SfxLinkUndoAction::CanRepeat(SfxRepeatTarget& r) const { return pAction && pAction->CanRepeat(r); } - - void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r) { if ( pAction && pAction->CanRepeat( r ) ) @@ -1459,7 +1453,6 @@ void SfxLinkUndoAction::Repeat(SfxRepeatTarget&r) } - OUString SfxLinkUndoAction::GetComment() const { if ( pAction ) @@ -1468,7 +1461,6 @@ OUString SfxLinkUndoAction::GetComment() const } - OUString SfxLinkUndoAction::GetRepeatComment(SfxRepeatTarget&r) const { if ( pAction ) diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index 7bca666bd70a..007913293db9 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -90,5 +90,4 @@ com_sun_star_comp_svl_PathService_get_implementation(css::uno::XComponentContext } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx index f2af7146178c..843e4e251e12 100644 --- a/svtools/inc/table/tablecontrolinterface.hxx +++ b/svtools/inc/table/tablecontrolinterface.hxx @@ -34,7 +34,6 @@ namespace svt { namespace table { - //= TableControlAction enum TableControlAction diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index a69c17d65b6f..3af061b39c10 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -112,7 +112,6 @@ void BrowseBox::ConstructImpl( BrowserMode nMode ) } - BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode ) :Control( pParent, nBits | WB_3DLOOK ) ,DragSourceHelper( this ) @@ -123,7 +122,6 @@ BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode ) } - BrowseBox::BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode ) :Control( pParent, rId ) ,DragSourceHelper( this ) @@ -169,14 +167,12 @@ void BrowseBox::dispose() } - short BrowseBox::GetCursorHideCount() const { return getDataWindow()->nCursorHidden; } - void BrowseBox::DoShowCursor( const char * ) { if (!getDataWindow()) @@ -195,7 +191,6 @@ void BrowseBox::DoShowCursor( const char * ) } - void BrowseBox::DoHideCursor( const char * ) { short nHiddenCount = ++getDataWindow()->nCursorHidden; @@ -212,14 +207,12 @@ void BrowseBox::DoHideCursor( const char * ) } - void BrowseBox::SetRealRowCount( const OUString &rRealRowCount ) { getDataWindow()->aRealRowCount = rRealRowCount; } - void BrowseBox::SetFont( const vcl::Font& rNewFont ) { pDataWin->SetFont( rNewFont ); @@ -227,14 +220,12 @@ void BrowseBox::SetFont( const vcl::Font& rNewFont ) } - sal_uLong BrowseBox::GetDefaultColumnWidth( const OUString& _rText ) const { return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4; } - void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) { @@ -265,7 +256,6 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) } - void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText, long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos ) { @@ -410,7 +400,6 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, bool bFreeze ) } - void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) { // never set pos of the handle column @@ -529,7 +518,6 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ) } - void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle ) { @@ -574,7 +562,6 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle ) } - void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) { @@ -682,7 +669,6 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) } - void BrowseBox::AutoSizeLastColumn() { if ( getDataWindow()->bAutoSizeLastCol && @@ -695,7 +681,6 @@ void BrowseBox::AutoSizeLastColumn() } - void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) { @@ -778,7 +763,6 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) } - void BrowseBox::RemoveColumns() { size_t nOldCount = pCols->size(); @@ -848,7 +832,6 @@ void BrowseBox::RemoveColumns() } - OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const { @@ -859,14 +842,12 @@ OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const } - long BrowseBox::GetRowCount() const { return nRowCount; } - sal_uInt16 BrowseBox::ColCount() const { @@ -874,7 +855,6 @@ sal_uInt16 BrowseBox::ColCount() const } - long BrowseBox::ImpGetDataRowHeight() const { @@ -886,7 +866,6 @@ long BrowseBox::ImpGetDataRowHeight() const } - void BrowseBox::SetDataRowHeight( long nPixel ) { @@ -896,7 +875,6 @@ void BrowseBox::SetDataRowHeight( long nPixel ) } - void BrowseBox::SetTitleLines( sal_uInt16 nLines ) { @@ -904,7 +882,6 @@ void BrowseBox::SetTitleLines( sal_uInt16 nLines ) } - long BrowseBox::ScrollColumns( long nCols ) { @@ -1047,7 +1024,6 @@ long BrowseBox::ScrollColumns( long nCols ) } - long BrowseBox::ScrollRows( long nRows ) { @@ -1104,7 +1080,6 @@ long BrowseBox::ScrollRows( long nRows ) } - void BrowseBox::RowModified( long nRow, sal_uInt16 nColId ) { @@ -1125,7 +1100,6 @@ void BrowseBox::RowModified( long nRow, sal_uInt16 nColId ) } - void BrowseBox::Clear() { @@ -1294,7 +1268,6 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeep } - void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) { @@ -1466,14 +1439,12 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) } - bool BrowseBox::GoToRow( long nRow) { return GoToRow(nRow, false); } - bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection ) { @@ -1560,7 +1531,6 @@ bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection ) } - bool BrowseBox::GoToColumnId( sal_uInt16 nColId) { return GoToColumnId(nColId, true); @@ -1626,7 +1596,6 @@ bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowCol } - bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) { @@ -1657,7 +1626,6 @@ bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) } - void BrowseBox::SetNoSelection() { @@ -1697,7 +1665,6 @@ void BrowseBox::SetNoSelection() } - void BrowseBox::SelectAll() { @@ -1763,7 +1730,6 @@ void BrowseBox::SelectAll() } - void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) { @@ -1836,7 +1802,6 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) } - long BrowseBox::GetSelectRowCount() const { @@ -1845,7 +1810,6 @@ long BrowseBox::GetSelectRowCount() const } - void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMakeVisible ) { @@ -1910,7 +1874,6 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak } - sal_uInt16 BrowseBox::GetSelectColumnCount() const { @@ -1926,7 +1889,6 @@ long BrowseBox::FirstSelectedColumn( ) const } - long BrowseBox::FirstSelectedRow( bool bInverse ) { @@ -1934,7 +1896,6 @@ long BrowseBox::FirstSelectedRow( bool bInverse ) } - long BrowseBox::NextSelectedRow() { @@ -1942,7 +1903,6 @@ long BrowseBox::NextSelectedRow() } - long BrowseBox::LastSelectedRow() { @@ -1950,7 +1910,6 @@ long BrowseBox::LastSelectedRow() } - bool BrowseBox::IsRowSelected( long nRow ) const { @@ -1958,7 +1917,6 @@ bool BrowseBox::IsRowSelected( long nRow ) const } - bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const { @@ -2047,7 +2005,6 @@ bool BrowseBox::MakeFieldVisible } - bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, bool bCompletely ) const { @@ -2073,7 +2030,6 @@ bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, } - Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, bool bRelToBrowser) const { @@ -2095,7 +2051,6 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, } - Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const { @@ -2123,7 +2078,6 @@ Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const } - Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const { @@ -2153,7 +2107,6 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const } - long BrowseBox::GetRowAtYPosPixel( long nY, bool bRelToBrowser ) const { @@ -2173,7 +2126,6 @@ long BrowseBox::GetRowAtYPosPixel( long nY, bool bRelToBrowser ) const } - Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const { @@ -2181,7 +2133,6 @@ Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const } - sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const { @@ -2201,7 +2152,6 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const } - void BrowseBox::ReserveControlArea( sal_uInt16 nWidth ) { @@ -2214,7 +2164,6 @@ void BrowseBox::ReserveControlArea( sal_uInt16 nWidth ) } - Rectangle BrowseBox::GetControlArea() const { @@ -2225,7 +2174,6 @@ Rectangle BrowseBox::GetControlArea() const } - void BrowseBox::SetMode( BrowserMode nMode ) { @@ -2352,7 +2300,6 @@ void BrowseBox::SetMode( BrowserMode nMode ) } - void BrowseBox::VisibleRowsChanged( long, sal_uInt16 ) { @@ -2368,7 +2315,6 @@ void BrowseBox::VisibleRowsChanged( long, sal_uInt16 ) } - bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const /* [Description] @@ -2388,14 +2334,12 @@ bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const } - long BrowseBox::GetDataRowHeight() const { return CalcZoom(nDataRowHeight ? nDataRowHeight : ImpGetDataRowHeight()); } - VclPtr<BrowserHeader> BrowseBox::CreateHeaderBar( BrowseBox* pParent ) { VclPtr<BrowserHeader> pNewBar = VclPtr<BrowserHeader>::Create( pParent ); @@ -2473,7 +2417,6 @@ void BrowseBox::LoseFocus() } - void BrowseBox::GetFocus() { OSL_TRACE( "BrowseBox: %p->GetFocus", this ); diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 660cf9036123..2cbf05481044 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -33,14 +33,12 @@ using namespace ::com::sun::star::datatransfer; #define getDataWindow() (static_cast<BrowserDataWin*>(pDataWin.get())) - void BrowseBox::StartDrag( sal_Int8 /* _nAction */, const Point& /* _rPosPixel */ ) { // not interested in this event } - sal_Int8 BrowseBox::AcceptDrop( const AcceptDropEvent& _rEvt ) { BrowserDataWin* pDataWindow = static_cast<BrowserDataWin*>(pDataWin.get()); @@ -50,7 +48,6 @@ sal_Int8 BrowseBox::AcceptDrop( const AcceptDropEvent& _rEvt ) } - sal_Int8 BrowseBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) { BrowserDataWin* pDataWindow = static_cast<BrowserDataWin*>(pDataWin.get()); @@ -60,7 +57,6 @@ sal_Int8 BrowseBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) } - sal_Int8 BrowseBox::AcceptDrop( const BrowserAcceptDropEvent& ) { // not interested in this event @@ -68,7 +64,6 @@ sal_Int8 BrowseBox::AcceptDrop( const BrowserAcceptDropEvent& ) } - sal_Int8 BrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& ) { // not interested in this event @@ -76,7 +71,6 @@ sal_Int8 BrowseBox::ExecuteDrop( const BrowserExecuteDropEvent& ) } - void* BrowseBox::implGetDataFlavors() const { if (static_cast<BrowserDataWin*>(pDataWin.get())->bCallingDropCallback) @@ -85,7 +79,6 @@ void* BrowseBox::implGetDataFlavors() const } - bool BrowseBox::IsDropFormatSupported( SotClipboardFormatId _nFormat ) { if ( static_cast< BrowserDataWin* >( pDataWin.get() )->bCallingDropCallback ) @@ -95,9 +88,6 @@ bool BrowseBox::IsDropFormatSupported( SotClipboardFormatId _nFormat ) } - - - void BrowseBox::Command( const CommandEvent& rEvt ) { if ( !getDataWindow()->bInCommand ) @@ -105,7 +95,6 @@ void BrowseBox::Command( const CommandEvent& rEvt ) } - void BrowseBox::StateChanged( StateChangedType nStateChange ) { Control::StateChanged( nStateChange ); @@ -181,76 +170,64 @@ void BrowseBox::StateChanged( StateChangedType nStateChange ) } - void BrowseBox::Select() { } - void BrowseBox::DoubleClick( const BrowserMouseEvent & ) { } - long BrowseBox::QueryMinimumRowHeight() { return CalcZoom( 5 ); } - void BrowseBox::ImplStartTracking() { } - void BrowseBox::ImplTracking() { } - void BrowseBox::ImplEndTracking() { } - void BrowseBox::RowHeightChanged() { } - long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth ) { return nWidth; } - void BrowseBox::ColumnResized( sal_uInt16 ) { } - void BrowseBox::ColumnMoved( sal_uInt16 ) { } - void BrowseBox::StartScroll() { DoHideCursor( "StartScroll" ); } - void BrowseBox::EndScroll() { UpdateScrollbars(); @@ -259,7 +236,6 @@ void BrowseBox::EndScroll() } - void BrowseBox::ToggleSelection( bool bForce ) { @@ -333,7 +309,6 @@ void BrowseBox::ToggleSelection( bool bForce ) } - void BrowseBox::DrawCursor() { bool bReallyHide = false; @@ -403,7 +378,6 @@ void BrowseBox::DrawCursor() } - sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const { @@ -414,7 +388,6 @@ sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const } - sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const { @@ -424,7 +397,6 @@ sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const } - sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const { @@ -435,7 +407,6 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const } - bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const { @@ -446,7 +417,6 @@ bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const } - void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) { @@ -511,7 +481,6 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) } - void BrowseBox::Resize() { if ( !bBootstrapped && IsReallyVisible() ) @@ -589,7 +558,6 @@ void BrowseBox::Resize() } - void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { @@ -681,7 +649,6 @@ void BrowseBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect } - void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) { bool bDrawSelection = !(nFlags & DrawFlags::NoSelection); @@ -824,7 +791,6 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, } - void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections) { Point aOverallAreaPos = _bForeignDevice ? _rRect.TopLeft() : Point(0,0); @@ -1257,7 +1223,6 @@ void BrowseBox::UpdateScrollbars() } - void BrowseBox::SetUpdateMode( bool bUpdate ) { @@ -1287,7 +1252,6 @@ void BrowseBox::SetUpdateMode( bool bUpdate ) } - bool BrowseBox::GetUpdateMode() const { @@ -1295,7 +1259,6 @@ bool BrowseBox::GetUpdateMode() const } - long BrowseBox::GetFrozenWidth() const { @@ -1308,7 +1271,6 @@ long BrowseBox::GetFrozenWidth() const } - void BrowseBox::ColumnInserted( sal_uInt16 nPos ) { @@ -1318,7 +1280,6 @@ void BrowseBox::ColumnInserted( sal_uInt16 nPos ) } - sal_uInt16 BrowseBox::FrozenColCount() const { sal_uInt16 nCol; @@ -1330,7 +1291,6 @@ sal_uInt16 BrowseBox::FrozenColCount() const } - IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) { @@ -1350,7 +1310,6 @@ IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) } - IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) { @@ -1362,7 +1321,6 @@ IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) } - IMPL_LINK_TYPED( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) { pBar->SetDragSize( pDataWin->GetOutputSizePixel().Height() ); @@ -1425,7 +1383,6 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) } - void BrowseBox::MouseMove( const MouseEvent& rEvt ) { OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" ); @@ -1478,7 +1435,6 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) } - void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) { @@ -1514,7 +1470,6 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) } - bool bExtendedMode = false; bool bFieldMode = false; @@ -1664,7 +1619,6 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) } - void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) { @@ -1702,7 +1656,6 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) } - void BrowseBox::KeyInput( const KeyEvent& rEvt ) { if ( !ProcessKey( rEvt ) ) @@ -1710,7 +1663,6 @@ void BrowseBox::KeyInput( const KeyEvent& rEvt ) } - bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) { @@ -1780,7 +1732,6 @@ bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) } - void BrowseBox::Dispatch( sal_uInt16 nId ) { @@ -1970,7 +1921,6 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) } - void BrowseBox::SetCursorColor(const Color& _rCol) { if (_rCol == m_aCursorColor) diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 0c8a015c1712..14bb9137ed57 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -66,7 +66,6 @@ namespace svt } - Reference< XAccessible > BrowseBoxImpl::getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType ) { if ( m_pAccessible && m_pAccessible->isAlive() ) @@ -84,7 +83,6 @@ namespace svt } - Reference< XAccessible > BrowseBox::CreateAccessible() { vcl::Window* pParent = GetAccessibleParentWindow(); @@ -319,7 +317,6 @@ OUString BrowseBox::GetColumnDescription( sal_uInt16 _nColumn ) const } - void BrowseBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, ::svt::AccessibleBrowseBoxObjType eObjType ) const diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index c0b99ef473ad..22691670b750 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -22,7 +22,6 @@ #include <svtools/brwbox.hxx> - BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits ) :HeaderBar( pParent, nWinBits ) ,_pBrowseBox( pParent ) @@ -48,7 +47,6 @@ void BrowserHeader::dispose() } - void BrowserHeader::Command( const CommandEvent& rCEvt ) { if ( !GetCurItemId() && CommandEventId::ContextMenu == rCEvt.GetCommand() ) @@ -63,14 +61,12 @@ void BrowserHeader::Command( const CommandEvent& rCEvt ) } - void BrowserHeader::Select() { HeaderBar::Select(); } - void BrowserHeader::EndDrag() { // call before other actions, it looks more nice in most cases @@ -113,7 +109,4 @@ void BrowserHeader::EndDrag() } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index aec67c3b2ef4..568bc00c8778 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -180,7 +180,6 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos } - void BrowserColumn::ZoomChanged(const Fraction& rNewZoom) { double n = (double)_nOriginalWidth; @@ -191,7 +190,6 @@ void BrowserColumn::ZoomChanged(const Fraction& rNewZoom) } - BrowserDataWin::BrowserDataWin( BrowseBox* pParent ) :Control( pParent, WinBits(WB_CLIPCHILDREN) ) ,DragSourceHelper( this ) @@ -321,7 +319,6 @@ void BrowserDataWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& } - BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel ) { BrowseBox *pBox = GetParent(); @@ -436,7 +433,6 @@ void BrowserDataWin::Command( const CommandEvent& rEvt ) } - bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent ) { if ( ! ( GetParent()->IsInteractiveRowHeightEnabled() @@ -452,7 +448,6 @@ bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent ) } - void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt ) { aLastMousePos = OutputToScreenPixel( rEvt.GetPosPixel() ); @@ -468,7 +463,6 @@ void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt ) } - void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) { // avoid pseudo MouseMoves @@ -503,7 +497,6 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) } - IMPL_LINK_NOARG_TYPED(BrowserDataWin, RepeatedMouseMove, Timer *, void) { GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) ); @@ -526,7 +519,6 @@ void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt ) } - void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos ) { long nDataRowHeight = GetParent()->GetDataRowHeight(); @@ -551,7 +543,6 @@ void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos ) } - void BrowserDataWin::Tracking( const TrackingEvent& rTEvt ) { if ( !GetParent()->bRowDividerDrag ) @@ -596,7 +587,6 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt ) } - void BrowserDataWin::KeyInput( const KeyEvent& rEvt ) { // pass to parent window @@ -605,7 +595,6 @@ void BrowserDataWin::KeyInput( const KeyEvent& rEvt ) } - void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) { pEventWin = this; @@ -614,7 +603,6 @@ void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) } - BrowseEvent::BrowseEvent( vcl::Window* pWindow, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): @@ -635,7 +623,6 @@ BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWindow, } - BrowserMouseEvent::BrowserMouseEvent( vcl::Window *pWindow, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): @@ -645,7 +632,6 @@ BrowserMouseEvent::BrowserMouseEvent( vcl::Window *pWindow, const MouseEvent& rE } - BrowserAcceptDropEvent::BrowserAcceptDropEvent( BrowserDataWin *pWindow, const AcceptDropEvent& rEvt ) :AcceptDropEvent(rEvt) ,BrowseEvent( pWindow->CreateBrowseEvent( rEvt.maPosPixel ) ) @@ -653,7 +639,6 @@ BrowserAcceptDropEvent::BrowserAcceptDropEvent( BrowserDataWin *pWindow, const A } - BrowserExecuteDropEvent::BrowserExecuteDropEvent( BrowserDataWin *pWindow, const ExecuteDropEvent& rEvt ) :ExecuteDropEvent(rEvt) ,BrowseEvent( pWindow->CreateBrowseEvent( rEvt.maPosPixel ) ) @@ -661,9 +646,6 @@ BrowserExecuteDropEvent::BrowserExecuteDropEvent( BrowserDataWin *pWindow, const } - - - void BrowserDataWin::SetUpdateMode( bool bMode ) { DBG_ASSERT( !bUpdateMode || aInvalidRegion.empty(), "invalid region not empty" ); @@ -686,7 +668,6 @@ void BrowserDataWin::DoOutstandingInvalidations() } - void BrowserDataWin::Invalidate( InvalidateFlags nFlags ) { if ( !GetUpdateMode() ) @@ -701,7 +682,6 @@ void BrowserDataWin::Invalidate( InvalidateFlags nFlags ) } - void BrowserDataWin::Invalidate( const Rectangle& rRect, InvalidateFlags nFlags ) { if ( !GetUpdateMode() ) @@ -745,7 +725,6 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt ) } - void BrowserScrollBar::EndScroll() { if ( _nTip ) diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index c3aa74b532d0..9579568b1383 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -28,13 +28,11 @@ #include <vector> - #define MIN_COLUMNWIDTH 2 typedef ::std::vector< Rectangle* > RectangleList; - class ButtonFrame { Rectangle aRect; @@ -64,7 +62,6 @@ public: }; - class BrowserColumn { sal_uInt16 _nId; @@ -95,7 +92,6 @@ public: }; - class BrowserDataWin :public Control ,public DragSourceHelper @@ -181,7 +177,6 @@ protected: }; - class BrowserScrollBar: public ScrollBar { sal_uLong _nTip; @@ -205,12 +200,10 @@ public: }; - void InitSettings_Impl( vcl::Window *pWin, bool bFont = true, bool bForeground = true, bool bBackground = true ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 47d6ab94aea2..ef1974a2f149 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -28,9 +28,6 @@ namespace svt { - - - //= ComboBoxControl ComboBoxControl::ComboBoxControl(vcl::Window* pParent, WinBits nWinStyle) @@ -596,5 +593,4 @@ namespace svt } // namespace svt - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index c9cedc8e1299..1865e0d5a4bd 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -87,7 +87,6 @@ namespace svt } - //= EditBrowseBox @@ -1192,7 +1191,6 @@ namespace svt } - bool EditBrowseBox::SaveModified() { return true; @@ -1300,7 +1298,6 @@ namespace svt } - CellController::CellController(Control* pW) :pWindow( pW ) ,bSuspended( true ) diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 8c186d1bdccf..f0ab7d045c01 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -204,5 +204,4 @@ sal_Int32 EditBrowseBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumn } // namespace svt - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index bead1d82d232..338210c8309c 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -623,5 +623,4 @@ void SvtAccessibilityOptions::SetVCLSettings() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index ee4b1342340b..3ec697ff81c1 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -224,5 +224,4 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index fcaf46a1a2aa..b80df47d2583 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -357,7 +357,6 @@ IMPL_LINK_TYPED( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rE } - /** updates the font color in the vcl window settings */ void ColorConfig_Impl::ImplUpdateApplicationSettings() { diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 37eb86115b68..68faf1ce1cc5 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -550,9 +550,6 @@ IMPL_LINK_TYPED( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEv } - - - ExtendedColorConfig::ExtendedColorConfig() { ::osl::MutexGuard aGuard( ColorMutex_Impl::get() ); diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index dc12c7603bb0..9ec50956dd6b 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -120,8 +120,6 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() } - - SvtHelpOptions_Impl::SvtHelpOptions_Impl() : ConfigItem( OUString( "Office.Common/Help" ) ) , bExtendedHelp( false ) @@ -215,7 +213,6 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames) } - void SvtHelpOptions_Impl::ImplCommit() { Sequence< OUString > aNames = GetPropertyNames(); @@ -251,7 +248,6 @@ void SvtHelpOptions_Impl::ImplCommit() } - void SvtHelpOptions_Impl::Notify( const Sequence<OUString>& aPropertyNames ) { Load( aPropertyNames ); @@ -272,7 +268,6 @@ SvtHelpOptions::SvtHelpOptions() } - SvtHelpOptions::~SvtHelpOptions() { // Global access, must be guarded (multithreading) @@ -306,7 +301,6 @@ bool SvtHelpOptions::IsHelpTips() const } - void SvtHelpOptions::SetWelcomeScreen( bool b ) { pImp->SetWelcomeScreen( b ); diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index db190b08bb3c..4372052e2751 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -264,18 +264,12 @@ void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize) } - - - - bool SvxHtmlOptions::IsImportUnknown() const { return 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS) ; } - - void SvxHtmlOptions::SetImportUnknown(bool bSet) { if(bSet) @@ -286,24 +280,18 @@ void SvxHtmlOptions::SetImportUnknown(bool bSet) } - - sal_uInt16 SvxHtmlOptions::GetExportMode() const { return (sal_uInt16)pImp->nExportMode; } - - bool SvxHtmlOptions::IsStarBasic() const { return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ; } - - void SvxHtmlOptions::SetStarBasic(bool bSet) { if(bSet) diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 337f2b1f0d41..2113bcfb1308 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -681,37 +681,27 @@ void SvtOptionsDrawinglayer_Impl::Notify( const css::uno::Sequence<OUString>& ) // public method - // public method - // public method - // public method - // public method // #i73602# - // #i74769#, #i75172# - // #i4219# - - - - // helper bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const { @@ -740,11 +730,6 @@ bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const // primitives - - - - - void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( bool bState ) { if(m_bAntiAliasing != bState) diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index 3b01d07d19cf..362089fb4e66 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -18,7 +18,6 @@ */ - // switches // use it to enable test scenarios diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index d2e6c1699019..e0d17cf04869 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -343,7 +343,6 @@ namespace svt } - bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL ) { OUString entryName = sRealURL.copy( sRealURL.lastIndexOf( '/' ) + 1 ); diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx index 4484482e09e2..c287f3a64748 100644 --- a/svtools/source/contnr/contentenumeration.hxx +++ b/svtools/source/contnr/contentenumeration.hxx @@ -33,7 +33,6 @@ namespace svt { - //= SortingData_Impl struct SortingData_Impl diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 720b48b1e80e..b442cb2c9f4a 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -131,7 +131,6 @@ namespace } - void FilterMatch::createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters) { if( _rFilterList.getLength() ) @@ -534,7 +533,6 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, } - ViewTabListBox_Impl::~ViewTabListBox_Impl() { disposeOnce(); @@ -549,7 +547,6 @@ void ViewTabListBox_Impl::dispose() } - IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) { ::osl::MutexGuard aGuard( maMutex ); @@ -559,7 +556,6 @@ IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) } - void ViewTabListBox_Impl::Resize() { SvTabListBox::Resize(); @@ -586,7 +582,6 @@ void ViewTabListBox_Impl::Resize() } - void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) { bool bHandled = false; @@ -623,7 +618,6 @@ void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt ) } - std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu() { bool bEnableDelete = mbEnableDelete; @@ -709,7 +703,6 @@ std::unique_ptr<PopupMenu> ViewTabListBox_Impl::CreateContextMenu() } - void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { switch ( nSelectedPopupEntry ) @@ -725,7 +718,6 @@ void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEn } - void ViewTabListBox_Impl::ClearAll() { for ( sal_uLong i = 0; i < GetEntryCount(); ++i ) @@ -1029,7 +1021,6 @@ OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) } - OUString SvtFileView::GetCurrentURL() const { OUString aURL; @@ -1050,7 +1041,6 @@ void SvtFileView::CreatedFolder( const OUString& rUrl, const OUString& rNewFolde } - FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDescriptor ) { FileViewResult eResult = eFailure; @@ -1063,7 +1053,6 @@ FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDesc } - bool SvtFileView::GetParentURL( OUString& rParentURL ) const { bool bRet = false; @@ -1091,21 +1080,18 @@ bool SvtFileView::GetParentURL( OUString& rParentURL ) const } - const OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } - void SvtFileView::SetHelpId( const OString& rHelpId ) { mpImp->mpView->SetHelpId( rHelpId ); } - void SvtFileView::SetSizePixel( const Size& rNewSize ) { Control::SetSizePixel( rNewSize ); @@ -1113,7 +1099,6 @@ void SvtFileView::SetSizePixel( const Size& rNewSize ) } - void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { SetPosPixel( rNewPos ); @@ -1194,7 +1179,6 @@ void SvtFileView::SetNoSelection() } - void SvtFileView::GetFocus() { Control::GetFocus(); @@ -1203,35 +1187,30 @@ void SvtFileView::GetFocus() } - void SvtFileView::SetSelectHdl( const Link<SvTreeListBox*,void>& rHdl ) { mpImp->SetSelectHandler( rHdl ); } - void SvtFileView::SetDoubleClickHdl( const Link<SvTreeListBox*,bool>& rHdl ) { mpImp->mpView->SetDoubleClickHdl( rHdl ); } - sal_uLong SvtFileView::GetSelectionCount() const { return mpImp->mpView->GetSelectionCount(); } - SvTreeListEntry* SvtFileView::FirstSelected() const { return mpImp->mpView->FirstSelected(); } - SvTreeListEntry* SvtFileView::NextSelected( SvTreeListEntry* pEntry ) const { return mpImp->mpView->NextSelected( pEntry ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 0dfbd0a72b28..b6a8d94f9997 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -41,7 +41,6 @@ class IcnViewEdit_Impl; class IcnGridMap_Impl; - // some defines #define PAINTFLAG_HOR_CENTERED 0x0001 @@ -79,9 +78,6 @@ class IcnGridMap_Impl; #define VIEWMODE_MASK (WB_ICON | WB_SMALLICON | WB_DETAILS) - - - enum IcnViewFieldType { IcnViewFieldTypeDontknow = 0, @@ -90,7 +86,6 @@ enum IcnViewFieldType }; - // Data about the focus of entries struct LocalFocus @@ -103,7 +98,6 @@ struct LocalFocus }; - // Entry-List typedef ::std::vector< SvxIconChoiceCtrlEntry* > SvxIconChoiceCtrlEntryList_impl; @@ -145,8 +139,6 @@ public: }; - - // Implementation-class of IconChoiceCtrl @@ -578,7 +570,6 @@ public: }; - typedef sal_uLong GridId; #define GRID_NOT_FOUND ((GridId)ULONG_MAX) diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index f7ea4cf05502..2b7132eecf5d 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2775,7 +2775,6 @@ IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Idle *, void) } - // Function to align entries to the grid @@ -2902,7 +2901,6 @@ SvxIconChoiceCtrlTextMode SvxIconChoiceCtrl_Impl::GetEntryTextModeSmart( const S } - // Draw my own focusrect, because the focusrect of the outputdevice has got the inverted color // of the background. But what will we see, if the backgroundcolor is gray ? - We will see // a gray focusrect on a gray background !!! @@ -2957,8 +2955,6 @@ bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos } - - IMPL_LINK_TYPED(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId, void ) { if( nId == EVENTID_ADJUST_SCROLLBARS ) diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 66593313a3db..e001b3f3068c 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -98,8 +98,6 @@ void IcnCursor_Impl::ImplCreate() } - - void IcnCursor_Impl::Clear() { if( xColumns ) @@ -271,7 +269,6 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::SearchRow(sal_uInt16 nRow, sal_uInt16 nL } - /* Searches, starting from the passed value, the next entry to the left/to the right. Example for bRight = sal_True: @@ -780,5 +777,4 @@ void IcnGridMap_Impl::GetGridCoord( GridId nId, sal_uInt16& rGridX, sal_uInt16& } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index b69ce115308e..1576b6cfc4be 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -55,7 +55,6 @@ OUString SvxIconChoiceCtrlEntry::GetDisplayText() const } - SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& rInfo ) : aColText( rInfo.aColText ), aColImage( rInfo.aColImage ) { diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index fbe6a3266706..b3135b844940 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -537,7 +537,6 @@ void SvImpLBox::KeyDown( bool bPageDown, bool bNotifyScroll ) } - void SvImpLBox::InvalidateEntriesFrom( long nY ) const { if( !(nFlags & F_IN_PAINT )) @@ -701,7 +700,6 @@ void SvImpLBox::ShowCursor( bool bShow ) } - void SvImpLBox::UpdateAll( bool bInvalidateCompleteView, bool bUpdateVerScrollBar ) { @@ -1378,8 +1376,6 @@ void SvImpLBox::FillView() } - - void SvImpLBox::ShowVerSBar() { bool bVerBar = ( pView->GetStyle() & WB_VSCROLL ) != 0; @@ -1500,7 +1496,6 @@ void SvImpLBox::SetEntryHeight( short /* nHeight */ ) } - // *********************************************************************** // Callback Functions // *********************************************************************** @@ -1825,7 +1820,6 @@ void SvImpLBox::EntryMoved( SvTreeListEntry* pEntry ) } - void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry ) { if( GetUpdateMode() ) @@ -1881,7 +1875,6 @@ void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry ) } - // ******************************************************************** // Event handler // ******************************************************************** @@ -3416,7 +3409,6 @@ void SvImpLBox::CallEventListeners( sal_uLong nEvent, void* pData ) } - bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos ) { bool bRet = false; @@ -3432,7 +3424,6 @@ bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos ) } - bool SvImpLBox::IsSelectable( const SvTreeListEntry* pEntry ) { if( pEntry ) diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index cf12ad3dbc65..f842d3cfcb0c 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -1391,7 +1391,6 @@ void SvListView::Impl::RemoveViewData( SvTreeListEntry* pParent ) } - void SvListView::Impl::ActionRemoving( SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry,"Remove:No Entry"); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 540f5b0f2019..8b5bcb885b8d 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -543,8 +543,6 @@ bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nActi } - - /* NotifyMoving/Copying ==================== @@ -1927,7 +1925,6 @@ void SvTreeListBox::ImpEntryInserted( SvTreeListEntry* pEntry ) } - void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState eState) { if( nTreeFlags & SvTreeFlags::CHKBTN ) @@ -3428,7 +3425,6 @@ void SvTreeListBox::AddTab(long nTabPos, SvLBoxTabFlags nFlags, void* pUserData } - SvLBoxTab* SvTreeListBox::GetFirstDynamicTab( sal_uInt16& rPos ) const { sal_uInt16 nCurTab = 0; diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx index e32c65d81262..8fd1fc1f6f16 100644 --- a/svtools/source/contnr/treelistentry.cxx +++ b/svtools/source/contnr/treelistentry.cxx @@ -103,7 +103,6 @@ sal_uLong SvTreeListEntry::GetChildListPos() const } - void SvTreeListEntry::Clone(SvTreeListEntry* pSource) { nListPos &= 0x80000000; diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 1622d9dedc0e..ccc7e7e1561f 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; - //===== internal ============================================================ SvtRulerAccessible::SvtRulerAccessible( diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index eb345a30e139..26fc9a7d2e9f 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -23,11 +23,9 @@ #include <svtools/collatorres.hxx> - // wrapper for locale specific translations data of collator algorithm - class CollatorResourceData { friend class CollatorResource; @@ -55,11 +53,9 @@ class CollatorResourceData }; - // implementation of the collator-algorithm-name translation - #define COLLATOR_RESOURCE_COUNT (STR_SVT_COLLATE_END - STR_SVT_COLLATE_START + 1) CollatorResource::CollatorResource() diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 62c6172c60ff..75d80ccdeb05 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui; - FileControl::FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode nFlags ) : Window( pParent, nStyle|WB_DIALOGCONTROL ), maEdit( VclPtr<Edit>::Create(this, (nStyle&(~WB_BORDER))|WB_NOTABSTOP) ), @@ -54,7 +53,6 @@ FileControl::FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode } - WinBits FileControl::ImplInitStyle( WinBits nStyle ) { if ( !( nStyle & WB_NOTABSTOP ) ) @@ -83,7 +81,6 @@ WinBits FileControl::ImplInitStyle( WinBits nStyle ) } - FileControl::~FileControl() { disposeOnce(); @@ -104,14 +101,12 @@ void FileControl::SetText( const OUString& rStr ) } - OUString FileControl::GetText() const { return maEdit->GetText(); } - void FileControl::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::Enable ) @@ -151,7 +146,6 @@ void FileControl::StateChanged( StateChangedType nType ) } - void FileControl::Resize() { static long ButtonBorder = 10; @@ -185,7 +179,6 @@ void FileControl::Resize() } - IMPL_LINK_NOARG_TYPED(FileControl, ButtonHdl, Button*, void) { ImplBrowseFile( ); diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index 8868747254d9..c4cc63cc4a7c 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -26,7 +26,6 @@ namespace svt { - //= FileURLBox diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 1814bc03da64..57e5629045a0 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -24,7 +24,6 @@ #include <vcl/tabpage.hxx> - namespace svt { class HyperLabelImpl @@ -195,7 +194,6 @@ namespace svt } - void HyperLabel::DataChanged( const DataChangedEvent& rDCEvt ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 85f2569c8b78..4fc91f00f106 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -23,11 +23,9 @@ #include <svtools/indexentryres.hxx> - // wrapper for locale specific translations data of indexentry algorithm - class IndexEntryResourceData { friend class IndexEntryResource; @@ -55,11 +53,9 @@ class IndexEntryResourceData }; - // implementation of the indexentry-algorithm-name translation - #define INDEXENTRY_RESOURCE_COUNT (STR_SVT_INDEXENTRY_END - STR_SVT_INDEXENTRY_START + 1) IndexEntryResource::IndexEntryResource() diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 55c1015640b9..1f0bfc153e5c 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -31,8 +31,6 @@ using namespace ::std; using namespace ::com::sun::star; - - class SvtScriptedTextHelper_Impl { private: @@ -302,8 +300,6 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) } - - SvtScriptedTextHelper::SvtScriptedTextHelper( OutputDevice& _rOutDevice ) : mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, nullptr, nullptr, nullptr ) ) { @@ -344,6 +340,4 @@ void SvtScriptedTextHelper::DrawText( const Point& _rPos ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 35a7f1e02321..892de72c7edd 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -21,7 +21,6 @@ #include <vcl/settings.hxx> - void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) { bHandleDragging = bool( nFlags & ScrollableWindowFlags::THUMBDRAGGING ); @@ -39,7 +38,6 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) } - ScrollableWindow::ScrollableWindow( vcl::Window* pParent, WinBits nBits, ScrollableWindowFlags nFlags ) : Window( pParent, WinBits(nBits|WB_CLIPCHILDREN) ), @@ -89,7 +87,6 @@ void ScrollableWindow::Command( const CommandEvent& rCEvt ) } - void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && @@ -103,7 +100,6 @@ void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt ) } - Size ScrollableWindow::GetOutputSizePixel() const { Size aSz( Window::GetOutputSizePixel() ); @@ -117,7 +113,6 @@ Size ScrollableWindow::GetOutputSizePixel() const } - IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling @@ -141,7 +136,6 @@ IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) } - IMPL_LINK_TYPED( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling @@ -161,7 +155,6 @@ IMPL_LINK_TYPED( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) } - void ScrollableWindow::Resize() { // get the new output-size in pixel @@ -285,7 +278,6 @@ void ScrollableWindow::Resize() } - void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode ) { MapMode aMap( rNewMapMode ); @@ -294,7 +286,6 @@ void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode ) } - MapMode ScrollableWindow::GetMapMode() const { MapMode aMap( Window::GetMapMode() ); @@ -303,7 +294,6 @@ MapMode ScrollableWindow::GetMapMode() const } - void ScrollableWindow::SetTotalSize( const Size& rNewSize ) { aTotPixSz = LogicToPixel( rNewSize ); @@ -311,7 +301,6 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize ) } - void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, ScrollFlags ) { // get the delta in pixel diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 08503e372f1a..66a0aad73276 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -63,7 +63,6 @@ static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) } - void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits ) { mnEntryId = nEntryId; @@ -78,7 +77,6 @@ void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits ) } - ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, MenuItemBits nBits ) : mrMenu( rMenu ) { @@ -89,7 +87,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUSt } - ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const OUString& rText, MenuItemBits nBits ) : mrMenu( rMenu ) { @@ -103,7 +100,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Imag } - ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits ) : mrMenu( rMenu ) { @@ -117,7 +113,6 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* p } - ToolbarMenuEntry::~ToolbarMenuEntry() { if( mxAccContext.is() ) @@ -131,7 +126,6 @@ ToolbarMenuEntry::~ToolbarMenuEntry() } - const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCreate /* = false */ ) { if( !mxAccContext.is() && bCreate ) @@ -150,7 +144,6 @@ const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCr } - sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) { if( mpControl ) @@ -165,7 +158,6 @@ sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException) } - Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) { const Reference< XAccessibleContext >& xContext = GetAccessible( true ); @@ -187,7 +179,6 @@ Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) } - ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Reference< css::frame::XFrame >& xFrame ) : mrMenu( rMenu ) , mxFrame( xFrame ) @@ -201,14 +192,12 @@ ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const css::uno::Referenc } - ToolbarMenu_Impl::~ToolbarMenu_Impl() { setAccessible( nullptr ); } - void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible ) { if( mxAccessible.get() != pAccessible ) @@ -221,7 +210,6 @@ void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible ) } - void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue ) { if( mxAccessible.is() ) @@ -229,14 +217,12 @@ void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const css::uno::Any& } - bool ToolbarMenu_Impl::hasAccessibleListeners() { return( mxAccessible.is() && mxAccessible->HasAccessibleListeners() ); } - sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) { sal_Int32 nCount = 0; @@ -261,7 +247,6 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) } - Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -283,7 +268,6 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) } - Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -300,7 +284,6 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl } - void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -331,7 +314,6 @@ void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (Ind } - bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -365,7 +347,6 @@ bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw } - void ToolbarMenu_Impl::clearAccessibleSelection() { if( mnHighlightedEntry != -1 ) @@ -376,8 +357,6 @@ void ToolbarMenu_Impl::clearAccessibleSelection() } - - void ToolbarMenu_Impl::notifyHighlightedEntry() { if( hasAccessibleListeners() ) @@ -414,7 +393,6 @@ void ToolbarMenu_Impl::notifyHighlightedEntry() } - ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const { if( (nEntry < 0) || (nEntry >= (int)maEntryVector.size() ) ) @@ -424,8 +402,6 @@ ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const } - - IMPL_LINK_NOARG_TYPED( ToolbarMenu, HighlightHdl, ValueSet*, void ) { mpImpl->notifyHighlightedEntry(); @@ -452,7 +428,6 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) } - ToolbarMenu::~ToolbarMenu() { disposeOnce(); @@ -485,7 +460,6 @@ void ToolbarMenu::dispose() } - int ToolbarMenu::getSelectedEntryId() const { ToolbarMenuEntry* pEntry = implGetEntry( mpImpl->mnSelectedEntry ); @@ -493,7 +467,6 @@ int ToolbarMenu::getSelectedEntryId() const } - int ToolbarMenu::getHighlightedEntryId() const { ToolbarMenuEntry* pEntry = implGetEntry( mpImpl->mnHighlightedEntry ); @@ -501,7 +474,6 @@ int ToolbarMenu::getHighlightedEntryId() const } - void ToolbarMenu::checkEntry( int nEntryId, bool bChecked ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -513,7 +485,6 @@ void ToolbarMenu::checkEntry( int nEntryId, bool bChecked ) } - void ToolbarMenu::enableEntry( int nEntryId, bool bEnable ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -532,7 +503,6 @@ void ToolbarMenu::enableEntry( int nEntryId, bool bEnable ) } - void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -546,7 +516,6 @@ void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr ) } - void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage ) { ToolbarMenuEntry* pEntry = implSearchEntry( nEntryId ); @@ -560,7 +529,6 @@ void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage ) } - void ToolbarMenu::initWindow() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -576,7 +544,6 @@ void ToolbarMenu::initWindow() } - static long ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) { rMaxWidth = rCheckHeight = rRadioHeight = 0; @@ -742,14 +709,12 @@ Size ToolbarMenu::implCalcSize() } - void ToolbarMenu::highlightFirstEntry() { implChangeHighlightEntry( 0 ); } - void ToolbarMenu::GetFocus() { if( mpImpl->mnHighlightedEntry == -1 ) @@ -759,7 +724,6 @@ void ToolbarMenu::GetFocus() } - void ToolbarMenu::LoseFocus() { if( mpImpl && mpImpl->mnHighlightedEntry != -1 ) @@ -769,28 +733,24 @@ void ToolbarMenu::LoseFocus() } - void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, rStr, nItemBits ) ); } - void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, rImage, rStr, nItemBits ) ); } - void ToolbarMenu::appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits ) { appendEntry( new ToolbarMenuEntry( *this, nEntryId, pControl, nItemBits ) ); } - void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry ) { mpImpl->maEntryVector.push_back(pEntry); @@ -800,14 +760,12 @@ void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry ) } - void ToolbarMenu::appendSeparator() { appendEntry( nullptr ); } - /** creates an empty ValueSet that is initialized and can be inserted with appendEntry. */ VclPtr<ValueSet> ToolbarMenu::createEmptyValueSetControl() { @@ -819,14 +777,12 @@ VclPtr<ValueSet> ToolbarMenu::createEmptyValueSetControl() } - ToolbarMenuEntry* ToolbarMenu::implGetEntry( int nEntry ) const { return mpImpl->implGetEntry( nEntry ); } - ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const { const int nEntryCount = mpImpl->maEntryVector.size(); @@ -844,7 +800,6 @@ ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const } - void ToolbarMenu::implHighlightEntry(vcl::RenderContext& rRenderContext, int nHighlightEntry, bool bHighlight) { Size aSz(GetOutputSizePixel()); @@ -940,7 +895,6 @@ void ToolbarMenu::implHighlightEntry(vcl::RenderContext& rRenderContext, int nHi } - void ToolbarMenu::implSelectEntry( int nSelectedEntry ) { mpImpl->mnSelectedEntry = nSelectedEntry; @@ -954,7 +908,6 @@ void ToolbarMenu::implSelectEntry( int nSelectedEntry ) } - void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt ) { implHighlightAtPosition(rMEvt, true); @@ -962,13 +915,11 @@ void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt ) } - void ToolbarMenu::MouseButtonUp( const MouseEvent& ) { } - void ToolbarMenu::MouseMove( const MouseEvent& rMEvt ) { if (!IsVisible()) @@ -978,7 +929,6 @@ void ToolbarMenu::MouseMove( const MouseEvent& rMEvt ) } - void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt, bool /*bMBDown*/) { long nMouseY = rMEvt.GetPosPixel().Y(); @@ -1025,7 +975,6 @@ void ToolbarMenu::implHighlightAtPosition(const MouseEvent& rMEvt, bool /*bMBDow } - void ToolbarMenu::implChangeHighlightEntry(int nEntry) { mpImpl->mnHighlightedEntry = nEntry; @@ -1035,7 +984,6 @@ void ToolbarMenu::implChangeHighlightEntry(int nEntry) } - static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLastColumn ) { ValueSet* pValueSet = dynamic_cast< ValueSet* >( pControl ); @@ -1065,7 +1013,6 @@ static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLa } - ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd ) { int n = 0, nLoop = 0; @@ -1143,7 +1090,6 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd ) } - void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl ) { ValueSet* pValueSet = dynamic_cast< ValueSet* >( pControl ); @@ -1176,7 +1122,6 @@ void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl } - void ToolbarMenu::KeyInput( const KeyEvent& rKEvent ) { Control* pForwardControl = nullptr; @@ -1469,14 +1414,12 @@ void ToolbarMenu::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void ToolbarMenu::RequestHelp( const HelpEvent& rHEvt ) { DockingWindow::RequestHelp( rHEvt ); } - void ToolbarMenu::StateChanged( StateChangedType nType ) { DockingWindow::StateChanged( nType ); @@ -1489,7 +1432,6 @@ void ToolbarMenu::StateChanged( StateChangedType nType ) } - void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) { DockingWindow::DataChanged( rDCEvt ); @@ -1505,7 +1447,6 @@ void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt ) } - void ToolbarMenu::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == CommandEventId::Wheel ) @@ -1519,7 +1460,6 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt ) } - Reference< css::accessibility::XAccessible > ToolbarMenu::CreateAccessible() { mpImpl->setAccessible( new ToolbarMenuAcc( *mpImpl ) ); @@ -1527,7 +1467,6 @@ Reference< css::accessibility::XAccessible > ToolbarMenu::CreateAccessible() } - // todo: move to new base class that will replace SfxPopupWindo void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) { @@ -1536,13 +1475,11 @@ void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) } - void ToolbarMenu::statusChanged( const css::frame::FeatureStateEvent& /*Event*/ ) throw ( css::uno::RuntimeException, std::exception ) { } - class ToolbarMenuStatusListener : public svt::FrameStatusListener { public: @@ -1556,7 +1493,6 @@ public: }; - ToolbarMenuStatusListener::ToolbarMenuStatusListener( const css::uno::Reference< css::frame::XFrame >& xFrame, ToolbarMenu& rToolbarMenu ) @@ -1566,7 +1502,6 @@ ToolbarMenuStatusListener::ToolbarMenuStatusListener( } - void SAL_CALL ToolbarMenuStatusListener::dispose() throw (css::uno::RuntimeException, std::exception) { mpMenu.clear(); @@ -1574,7 +1509,6 @@ void SAL_CALL ToolbarMenuStatusListener::dispose() throw (css::uno::RuntimeExcep } - void SAL_CALL ToolbarMenuStatusListener::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) { if( mpMenu ) @@ -1582,7 +1516,6 @@ void SAL_CALL ToolbarMenuStatusListener::statusChanged( const css::frame::Featur } - void ToolbarMenu::initStatusListener() { if( !mpImpl->mxStatusListener.is() ) @@ -1590,35 +1523,30 @@ void ToolbarMenu::initStatusListener() } - bool ToolbarMenu::IsInPopupMode() { return GetDockingManager()->IsInPopupMode(this); } - void ToolbarMenu::EndPopupMode() { GetDockingManager()->EndPopupMode(this); } - const Size& ToolbarMenu::getMenuSize() const { return mpImpl->maSize; } - void ToolbarMenu::SetSelectHdl( const Link<ToolbarMenu*,void>& rLink ) { mpImpl->maSelectHdl = rLink; } - } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 73d1cf1108d6..aab5f12249d8 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -52,7 +52,6 @@ ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent ) } - ToolbarMenuAcc::~ToolbarMenuAcc() { if( mpParent ) @@ -60,7 +59,6 @@ ToolbarMenuAcc::~ToolbarMenuAcc() } - IMPL_LINK_TYPED( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) { /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper @@ -78,7 +76,6 @@ IMPL_LINK_TYPED( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, v } - void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -115,7 +112,6 @@ void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } - void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, const Any& rNewValue ) { if( nEventId ) @@ -143,7 +139,6 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, } - Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -151,7 +146,6 @@ Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() } - sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -161,7 +155,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeExcep } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -171,7 +164,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -187,7 +179,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R } - sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -207,7 +198,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx } - sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -215,7 +205,6 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException, } - OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -223,7 +212,6 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeExcep } - OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -244,7 +232,6 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s } - Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -252,7 +239,6 @@ Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelati } - Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -272,7 +258,6 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet( } - Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -292,7 +277,6 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta } - void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -317,7 +301,6 @@ void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAcce } - void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -332,7 +315,6 @@ void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XA } - sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -344,7 +326,6 @@ sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) thro } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -376,7 +357,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw } - awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -394,7 +374,6 @@ awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException, std } - awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -404,7 +383,6 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException, std:: } - awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -414,7 +392,6 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen() throw (RuntimeExcepti } - awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -460,7 +437,6 @@ sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildInd } - void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -469,7 +445,6 @@ void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException } - void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -477,7 +452,6 @@ void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeExcept } - sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -487,7 +461,6 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (Runt } - Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -512,7 +485,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sa } - void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ThrowIfDisposed(); @@ -524,7 +496,6 @@ void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) t } - void SAL_CALL ToolbarMenuAcc::disposing() { EventListenerVector aListenerListCopy; @@ -578,13 +549,11 @@ ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent ) } - ToolbarMenuEntryAcc::~ToolbarMenuEntryAcc() { } - void SAL_CALL ToolbarMenuEntryAcc::disposing() { EventListenerVector aListenerListCopy; @@ -626,21 +595,18 @@ Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleConte } - sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount() throw (RuntimeException, std::exception) { return 0; } - Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throw IndexOutOfBoundsException(); } - Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -653,7 +619,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() thr } - sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -685,21 +650,18 @@ sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (Runt } - sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::LIST_ITEM; } - OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException, std::exception) { return OUString(); } - OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -720,14 +682,12 @@ OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeExcepti } - Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet() throw (RuntimeException, std::exception) { return Reference< XAccessibleRelationSet >(); } - Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -754,7 +714,6 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat } - Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { Locale aRet( "", "", "" ); @@ -772,7 +731,6 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone } - void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -791,7 +749,6 @@ void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< } - void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -805,7 +762,6 @@ void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc } - sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); @@ -816,7 +772,6 @@ sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) } - Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { Reference< XAccessible > xRet; @@ -824,7 +779,6 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( con } - awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -848,7 +802,6 @@ awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException } - awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); @@ -856,7 +809,6 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException, } - awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -874,7 +826,6 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeExc } - awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index b57c0c908bd6..76a8c91d2075 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -245,7 +245,6 @@ private: }; - struct ToolbarMenu_Impl { ToolbarMenu& mrMenu; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 66548367d96c..2d311db54a73 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -46,7 +46,6 @@ ValueSetItem::ValueSetItem( ValueSet& rParent ) } - ValueSetItem::~ValueSetItem() { if( mxAcc.is() ) @@ -56,7 +55,6 @@ ValueSetItem::~ValueSetItem() } - uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled ) { if( !mxAcc.is() ) @@ -78,13 +76,11 @@ ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled ) } - ValueSetAcc::~ValueSetAcc() { } - void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue ) { if( nEventId ) @@ -122,7 +118,6 @@ const uno::Sequence< sal_Int8 >& ValueSetAcc::getUnoTunnelId() } - ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() { @@ -138,8 +133,6 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa } - - void ValueSetAcc::GetFocus() { mbIsFocused = true; @@ -153,7 +146,6 @@ void ValueSetAcc::GetFocus() } - void ValueSetAcc::LoseFocus() { mbIsFocused = false; @@ -167,7 +159,6 @@ void ValueSetAcc::LoseFocus() } - uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext() throw (uno::RuntimeException, std::exception) { @@ -176,7 +167,6 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc } - sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -190,7 +180,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -208,7 +197,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -224,7 +212,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible } - sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { @@ -251,7 +238,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() } - sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -264,7 +250,6 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole() } - OUString SAL_CALL ValueSetAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -276,7 +261,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleDescription() } - OUString SAL_CALL ValueSetAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -303,7 +287,6 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName() } - uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -334,7 +317,6 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge } - uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -356,7 +338,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAc } - lang::Locale SAL_CALL ValueSetAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { @@ -377,7 +358,6 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale() } - void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -403,7 +383,6 @@ void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< acc } - void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -421,7 +400,6 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< } - sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException, std::exception) { @@ -434,7 +412,6 @@ sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint ) } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (uno::RuntimeException, std::exception) { @@ -458,7 +435,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible } - awt::Rectangle SAL_CALL ValueSetAcc::getBounds() throw (uno::RuntimeException, std::exception) { @@ -477,7 +453,6 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds() } - awt::Point SAL_CALL ValueSetAcc::getLocation() throw (uno::RuntimeException, std::exception) { @@ -492,7 +467,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocation() } - awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() throw (uno::RuntimeException, std::exception) { @@ -508,7 +482,6 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen() } - awt::Size SAL_CALL ValueSetAcc::getSize() throw (uno::RuntimeException, std::exception) { @@ -563,7 +536,6 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) } - sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -581,7 +553,6 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex } - void SAL_CALL ValueSetAcc::clearAccessibleSelection() throw (uno::RuntimeException, std::exception) { @@ -591,7 +562,6 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection() } - void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() throw (uno::RuntimeException, std::exception) { @@ -600,7 +570,6 @@ void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() } - sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -620,7 +589,6 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -640,7 +608,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc } - void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -653,7 +620,6 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) } - sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception ) { sal_Int64 nRet; @@ -667,8 +633,6 @@ sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& r } - - void SAL_CALL ValueSetAcc::disposing() { ::std::vector<uno::Reference<accessibility::XAccessibleEventListener> > aListenerListCopy; @@ -736,8 +700,6 @@ ValueSetItem* ValueSetAcc::getItem (sal_uInt16 nIndex) const } - - void ValueSetAcc::ThrowIfDisposed() throw (css::lang::DisposedException) { @@ -792,7 +754,6 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu } - void ValueItemAcc::ParentDestroyed() { const ::osl::MutexGuard aGuard( maMutex ); @@ -810,7 +771,6 @@ const uno::Sequence< sal_Int8 >& ValueItemAcc::getUnoTunnelId() } - ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData ) throw() { @@ -826,7 +786,6 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter } - uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAccessibleContext() throw (uno::RuntimeException, std::exception) { @@ -834,7 +793,6 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAc } - sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -842,7 +800,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -850,7 +807,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl } - uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -864,7 +820,6 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl } - sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { @@ -915,7 +870,6 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() } - sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -923,7 +877,6 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole() } - OUString SAL_CALL ValueItemAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -931,7 +884,6 @@ OUString SAL_CALL ValueItemAcc::getAccessibleDescription() } - OUString SAL_CALL ValueItemAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -954,7 +906,6 @@ OUString SAL_CALL ValueItemAcc::getAccessibleName() } - uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -962,7 +913,6 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::g } - uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -994,7 +944,6 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA } - lang::Locale SAL_CALL ValueItemAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { @@ -1014,7 +963,6 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() } - void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -1039,7 +987,6 @@ void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< ac } - void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) throw (uno::RuntimeException, std::exception) { @@ -1056,7 +1003,6 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< } - sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException, std::exception) { diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 9bd9272e2e89..7065e6dcf295 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -65,14 +65,12 @@ VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar() } - void VCLXAccessibleHeaderBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); } - void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); @@ -88,7 +86,6 @@ void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHel } - Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence<OUString> aNames { "com.sun.star.awt.AccessibleHeaderBar" }; diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx index 4979614f2f8e..a69be2e65cdf 100644 --- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx +++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; - // class AccessibleTabBar @@ -149,7 +148,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeE } - Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -161,7 +159,6 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_In } - Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -176,7 +173,6 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() thro } - sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -184,7 +180,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (Runti } - sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -193,7 +188,6 @@ sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeExcepti } - OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -202,7 +196,6 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeE } - OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -214,7 +207,6 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeExceptio } - Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -225,7 +217,6 @@ Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRe } - Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -246,7 +237,6 @@ Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleState } - css::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -266,7 +256,6 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( cons } - sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -276,7 +265,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException, } - sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -298,7 +286,6 @@ Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeExc } - OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -308,7 +295,6 @@ OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeExcept } - OUString VCLXAccessibleHeaderBarItem::getToolTipText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index bf66e5e31e7e..5c59f335d846 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -505,7 +505,6 @@ void AssignmentPersistentData::ImplCommit() // = AddressBookSourceDialog - AddressBookSourceDialog::AddressBookSourceDialog(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index ac147239217b..84f08f5c4c1e 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -56,17 +56,12 @@ void SvColorDialog::SetColor( const Color& rColor ) } - - - - void SvColorDialog::SetMode( sal_Int16 eMode ) { meMode = eMode; } - short SvColorDialog::Execute() { short ret = 0; diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index ef75158c66d0..866372209aaf 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -23,7 +23,6 @@ #include <vcl/print.hxx> - void ImplFillPrnDlgListBox( const Printer* pPrinter, ListBox* pBox, PushButton* pPropBtn ) { @@ -43,7 +42,6 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter, } - void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear ) { if ( bClear ) @@ -51,7 +49,6 @@ void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear ) } - Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, Printer* pPrinter, Printer* pTempPrinterIn ) { @@ -91,7 +88,6 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, } - Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinterIn ) { VclPtr<Printer> pTempPrinter( pTempPrinterIn ); @@ -111,7 +107,6 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinterIn ) } - void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) { if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) @@ -123,7 +118,6 @@ void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo ) } - static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddStr) { OUString aStr(rStr); @@ -133,14 +127,12 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt } - static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId) { return ImplPrnDlgAddString(rStr, SVT_RESSTR(nResId)); } - OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) { OUString aStr; @@ -216,7 +208,6 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) } - PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent) : ModalDialog(pParent, "PrinterSetupDialog", "svt/ui/printersetupdialog.ui") @@ -243,7 +234,6 @@ PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent) } - PrinterSetupDialog::~PrinterSetupDialog() { disposeOnce(); @@ -291,7 +281,6 @@ void PrinterSetupDialog::ImplSetInfo() } - IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) { QueueInfo aInfo; @@ -300,7 +289,6 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) } - IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) { if ( !mpTempPrinter ) @@ -309,7 +297,6 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) { mpTempPrinter = ImplPrnDlgListBoxSelect(m_pLbName, m_pBtnProperties, @@ -318,7 +305,6 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) } - bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) && IsReallyVisible() ) @@ -328,7 +314,6 @@ bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) } - void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) { if ( rDCEvt.GetType() == DataChangedEventType::PRINTER ) @@ -347,7 +332,6 @@ void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt ) } - short PrinterSetupDialog::Execute() { if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index f987cbd28b80..0f28cfe0f3e9 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -30,7 +30,6 @@ namespace svt { - //= WizardPageImplData struct WizardPageImplData diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index ee6f7ec44dec..f04fcb9da442 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -23,14 +23,12 @@ #include <svtools/wizdlg.hxx> - #define WIZARDDIALOG_BUTTON_OFFSET_Y 6 #define WIZARDDIALOG_BUTTON_DLGOFFSET_X 6 #define WIZARDDIALOG_VIEW_DLGOFFSET_X 6 #define WIZARDDIALOG_VIEW_DLGOFFSET_Y 6 - struct ImplWizPageData { ImplWizPageData* mpNext; @@ -38,7 +36,6 @@ struct ImplWizPageData }; - struct ImplWizButtonData { ImplWizButtonData* mpNext; @@ -47,7 +44,6 @@ struct ImplWizButtonData }; - void WizardDialog::ImplInitData() { mpFirstPage = nullptr; @@ -72,14 +68,12 @@ void WizardDialog::SetLeftAlignedButtonCount( sal_Int16 _nCount ) } - void WizardDialog::SetEmptyViewMargin() { mbEmptyViewMargin = true; } - void WizardDialog::ImplCalcSize( Size& rSize ) { // ButtonBar-Hoehe berechnen @@ -247,8 +241,6 @@ long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){ } - - void WizardDialog::ImplPosTabPage() { if ( !mpCurTabPage ) @@ -304,7 +296,6 @@ void WizardDialog::ImplPosTabPage() } - void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) { if ( mpCurTabPage == pTabPage ) @@ -327,7 +318,6 @@ void WizardDialog::ImplShowTabPage( TabPage* pTabPage ) } - TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const { sal_uInt16 nTempLevel = 0; @@ -353,7 +343,6 @@ WizardDialog::WizardDialog( vcl::Window* pParent, WinBits nStyle ) : } - WizardDialog::WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) : ModalDialog( pParent, rID, rUIXMLDescription ) { @@ -385,7 +374,6 @@ void WizardDialog::dispose() } - void WizardDialog::Resize() { if ( IsReallyShown() && !IsInInitShow() ) @@ -398,7 +386,6 @@ void WizardDialog::Resize() } - void WizardDialog::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::InitShow ) @@ -436,7 +423,6 @@ void WizardDialog::StateChanged( StateChangedType nType ) } - bool WizardDialog::Notify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && mpPrevBtn && mpNextBtn ) @@ -482,28 +468,24 @@ bool WizardDialog::Notify( NotifyEvent& rNEvt ) } - void WizardDialog::ActivatePage() { maActivateHdl.Call( this ); } - bool WizardDialog::DeactivatePage() { return true; } - bool WizardDialog::ShowNextPage() { return ShowPage( mnCurLevel+1 ); } - bool WizardDialog::ShowPrevPage() { if ( !mnCurLevel ) @@ -512,7 +494,6 @@ bool WizardDialog::ShowPrevPage() } - bool WizardDialog::ShowPage( sal_uInt16 nLevel ) { if ( DeactivatePage() ) @@ -527,7 +508,6 @@ bool WizardDialog::ShowPage( sal_uInt16 nLevel ) } - bool WizardDialog::Finish( long nResult ) { if ( DeactivatePage() ) @@ -546,7 +526,6 @@ bool WizardDialog::Finish( long nResult ) } - void WizardDialog::AddPage( TabPage* pPage ) { ImplWizPageData* pNewPageData = new ImplWizPageData; @@ -565,7 +544,6 @@ void WizardDialog::AddPage( TabPage* pPage ) } - void WizardDialog::RemovePage( TabPage* pPage ) { ImplWizPageData* pPrevPageData = nullptr; @@ -592,7 +570,6 @@ void WizardDialog::RemovePage( TabPage* pPage ) } - void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) { sal_uInt16 nTempLevel = 0; @@ -615,7 +592,6 @@ void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage ) } - TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const { sal_uInt16 nTempLevel = 0; @@ -632,7 +608,6 @@ TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const } - void WizardDialog::AddButton( Button* pButton, long nOffset ) { ImplWizButtonData* pNewBtnData = new ImplWizButtonData; @@ -652,7 +627,6 @@ void WizardDialog::AddButton( Button* pButton, long nOffset ) } - void WizardDialog::RemoveButton( Button* pButton ) { ImplWizButtonData* pPrevBtnData = nullptr; diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 86f43efe93f4..67a2fe35e3d6 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -18,7 +18,6 @@ */ - #include "unoiface.hxx" MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index c7e23232db51..31bf45cc34a4 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -123,20 +123,17 @@ SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XCompon } - SvFilterOptionsDialog::~SvFilterOptionsDialog() { } - void SAL_CALL SvFilterOptionsDialog::acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL SvFilterOptionsDialog::release() throw() { OWeakObject::release(); diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index bf1c96496e71..7ee7c7b1ceec 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -178,7 +178,6 @@ public: }; - #endif // INCLUDED_SVTOOLS_SOURCE_FILTER_EXPORTDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 1001080ac8f6..c245bb697d59 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -154,7 +154,6 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) } - OUString GraphicDescriptor::getImplementationName_Static() throw() { @@ -162,7 +161,6 @@ OUString GraphicDescriptor::getImplementationName_Static() } - uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() throw( ) { @@ -171,7 +169,6 @@ uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() } - uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -194,7 +191,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) } - uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -202,7 +198,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) } - void SAL_CALL GraphicDescriptor::acquire() throw() { @@ -210,7 +205,6 @@ void SAL_CALL GraphicDescriptor::acquire() } - void SAL_CALL GraphicDescriptor::release() throw() { @@ -218,7 +212,6 @@ void SAL_CALL GraphicDescriptor::release() } - OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException, std::exception ) { @@ -232,7 +225,6 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceNam } - uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -240,7 +232,6 @@ uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() } - uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() throw( uno::RuntimeException, std::exception ) { @@ -264,7 +255,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() } - ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -290,7 +280,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() } - void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -301,7 +290,6 @@ void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** } - void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 4df0ca32dda2..c94c338029dd 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -39,7 +39,6 @@ Graphic::Graphic() : } - Graphic::~Graphic() throw() { @@ -47,7 +46,6 @@ Graphic::~Graphic() } - void Graphic::init( const ::Graphic& rGraphic ) throw() { @@ -57,7 +55,6 @@ void Graphic::init( const ::Graphic& rGraphic ) } - uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) throw( uno::RuntimeException, std::exception ) { @@ -75,7 +72,6 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) } - uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -86,7 +82,6 @@ uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) } - void SAL_CALL Graphic::acquire() throw() { @@ -94,7 +89,6 @@ void SAL_CALL Graphic::acquire() } - void SAL_CALL Graphic::release() throw() { ::unographic::GraphicDescriptor::release(); @@ -107,7 +101,6 @@ OUString Graphic::getImplementationName_Static() } - uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static() throw() { @@ -156,7 +149,6 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() } - uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() throw(uno::RuntimeException, std::exception) { @@ -164,7 +156,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() } - ::sal_Int8 SAL_CALL Graphic::getType() throw (uno::RuntimeException, std::exception) { @@ -192,7 +183,6 @@ awt::Size SAL_CALL Graphic::getSize( ) throw (uno::RuntimeException, std::excep } - uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -211,7 +201,6 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeExce } - uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index 6a1c1a7b73cd..39293742e956 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -45,13 +45,11 @@ GraphicAttr::GraphicAttr() : } - GraphicAttr::~GraphicAttr() { } - bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const { return( ( mfGamma == rAttr.mfGamma ) && @@ -72,5 +70,4 @@ bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 45176740e8d0..39531e811200 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -37,7 +37,6 @@ // - defines - - #define WATERMARK_LUM_OFFSET 50 #define WATERMARK_CON_OFFSET -70 #define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L)) diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index cce56d148ecb..57ed103ed18f 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -100,7 +100,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -142,7 +141,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -162,8 +160,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( } - - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -193,7 +189,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -227,7 +222,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -304,7 +298,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O } - uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -377,7 +370,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc } - uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -720,7 +712,6 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal } - void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index d717522fb223..f40036cfb3d5 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -49,14 +49,12 @@ GraphicRendererVCL::GraphicRendererVCL() : } - GraphicRendererVCL::~GraphicRendererVCL() throw() { } - uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -81,7 +79,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType } - uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -89,7 +86,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) } - void SAL_CALL GraphicRendererVCL::acquire() throw() { @@ -97,7 +93,6 @@ void SAL_CALL GraphicRendererVCL::acquire() } - void SAL_CALL GraphicRendererVCL::release() throw() { @@ -105,7 +100,6 @@ void SAL_CALL GraphicRendererVCL::release() } - OUString SAL_CALL GraphicRendererVCL::getImplementationName() throw( uno::RuntimeException, std::exception ) { @@ -119,7 +113,6 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceNa } - uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -128,7 +121,6 @@ uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames( } - uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() throw( uno::RuntimeException, std::exception ) { @@ -153,7 +145,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() } - ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -174,7 +165,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() } - void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -229,7 +219,6 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry* } - void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException ) { @@ -268,7 +257,6 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry* } - void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic ) throw (uno::RuntimeException, std::exception) { diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 46fe571ab296..23e43f30ab30 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -47,13 +47,11 @@ GraphicTransformer::GraphicTransformer() } - GraphicTransformer::~GraphicTransformer() { } - void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo ) { BitmapWriteAccess* pWriteAccess = rAlpha.AcquireWriteAccess(); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index d4380badcd4f..0383e383b9ea 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -110,7 +110,6 @@ public: }; - // class VCLXFileControl class VCLXFileControl : css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow @@ -215,8 +214,6 @@ protected: }; - - // class SVTXRoadmap @@ -284,8 +281,6 @@ protected: }; - - // class SVTXNumericField class SVTXNumericField : public css::awt::XNumericField, public SVTXFormattedField diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 13f4bf06a255..9720e16bf5f6 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star; - TransferableClipboardListener::TransferableClipboardListener( const Link<TransferableDataHelper*,void>& rCallback ) : aLink( rCallback ) { diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index 704839f02c63..7f4cbdd9f5c5 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -56,5 +56,4 @@ namespace svt } // namespace svt - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 8ab29197b385..73a286c28968 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -28,7 +28,6 @@ namespace svt { - //= IWindowOperator diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 876e992d6fd7..77c3ecda6043 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -142,7 +142,6 @@ static sal_uInt16 aWndFunc( } - SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong lEndP, ResMgr *pMgrP) : lStart(lStartP), lEnd(lEndP), nId(nIdP), pMgr(pMgrP), pFreeMgr( nullptr ) @@ -156,14 +155,12 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l } - SfxErrorHandler::~SfxErrorHandler() { delete pFreeMgr; } - bool SfxErrorHandler::CreateString( const ErrorInfo *pErr, OUString &rStr, sal_uInt16& nFlags) const @@ -208,7 +205,6 @@ bool SfxErrorHandler::CreateString( } - class ResString: public OUString /* [Description] @@ -227,7 +223,6 @@ class ResString: public OUString }; - ResString::ResString(ResId & rId): OUString(rId.SetAutoRelease(false).toString()), nFlags(0) @@ -241,7 +236,6 @@ ResString::ResString(ResId & rId): } - struct ErrorResource_Impl : private Resource /* [Description] @@ -290,7 +284,6 @@ bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const } - bool SfxErrorHandler::GetMessageString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -319,7 +312,6 @@ bool SfxErrorHandler::GetMessageString( } - bool SfxErrorHandler::GetErrorString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const @@ -367,7 +359,6 @@ bool SfxErrorHandler::GetErrorString( } - SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) @@ -377,7 +368,6 @@ SfxErrorContext::SfxErrorContext( } - SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1P, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) @@ -389,7 +379,6 @@ SfxErrorContext::SfxErrorContext( } - bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr) /* [Description] diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index a0a952388a1c..666e43a878fc 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -55,7 +55,6 @@ SvEmbedTransferHelper::SvEmbedTransferHelper( const uno::Reference< embed::XEmbe } - SvEmbedTransferHelper::~SvEmbedTransferHelper() { if ( m_pGraphic ) @@ -80,7 +79,6 @@ void SvEmbedTransferHelper::AddSupportedFormats() } - bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) { bool bRet = false; @@ -196,7 +194,6 @@ bool SvEmbedTransferHelper::GetData( const css::datatransfer::DataFlavor& rFlavo } - void SvEmbedTransferHelper::ObjectReleased() { m_xObj.clear(); diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 7f011fb29430..58ce528e57db 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -194,7 +194,6 @@ static SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] = }; - static OUString GetImageExtensionByFactory_Impl( const OUString& rURL ) { INetURLObject aObj( rURL ); diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx index 31246d3caf28..49e8dd9b4aba 100644 --- a/svtools/source/misc/imap3.cxx +++ b/svtools/source/misc/imap3.cxx @@ -84,5 +84,4 @@ IMapCompat::~IMapCompat() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index fc8c7b8bcfdd..6b35a0d1953f 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -183,7 +183,6 @@ OUString SvtLanguageTable::GetLanguageString( const LanguageType eType, bool bUs } - LanguageType SvtLanguageTableImpl::GetType( const OUString& rStr ) const { LanguageType eType = LANGUAGE_DONTKNOW; @@ -206,7 +205,6 @@ LanguageType SvtLanguageTable::GetLanguageType( const OUString& rStr ) } - sal_uInt32 SvtLanguageTableImpl::GetEntryCount() const { return Count(); @@ -218,7 +216,6 @@ sal_uInt32 SvtLanguageTable::GetLanguageEntryCount() } - LanguageType SvtLanguageTableImpl::GetTypeAtIndex( sal_uInt32 nIndex ) const { LanguageType nType = LANGUAGE_DONTKNOW; diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 671c9668fb9c..efbd8b6e2dc8 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -45,7 +45,6 @@ OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Referenc } - OpenFileDropTargetListener::~OpenFileDropTargetListener() { m_xTargetFrame.clear(); @@ -55,7 +54,6 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener() } - void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { m_xTargetFrame.clear(); @@ -63,7 +61,6 @@ void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObjec } - void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) { const sal_Int8 nAction = dtde.DropAction; @@ -98,7 +95,6 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr } - void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw( css::uno::RuntimeException, std::exception ) { try @@ -113,7 +109,6 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn } - void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw( css::uno::RuntimeException, std::exception ) { try @@ -126,7 +121,6 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd } - void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw( css::uno::RuntimeException, std::exception ) { try @@ -145,7 +139,6 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd } - void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw( css::uno::RuntimeException, std::exception ) { } diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 1bceffc6f5bf..dd56ccebb715 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -160,8 +160,6 @@ namespace svt }; - - TemplateContent::TemplateContent( const INetURLObject& _rURL ) :m_aURL( _rURL ) { @@ -504,7 +502,6 @@ namespace svt } - void TemplateFolderCacheImpl::normalize( TemplateFolderContent& _rState ) { SubContentSort()( _rState ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 3ef3b2b7b9b4..2a2d0171722f 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -65,7 +65,6 @@ // - Namespaces - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; @@ -161,7 +160,6 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj } - static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, const DataFlavorEx& rFlavorEx ) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -241,25 +239,21 @@ TransferableHelper::TerminateListener::TerminateListener( TransferableHelper& rT } - TransferableHelper::TerminateListener::~TerminateListener() { } - void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) throw( TerminationVetoException, RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) throw( RuntimeException, std::exception ) { mrParent.ImplFlush(); @@ -276,7 +270,6 @@ TransferableHelper::TransferableHelper() : } - TransferableHelper::~TransferableHelper() { delete mpObjDesc; @@ -409,7 +402,6 @@ Any SAL_CALL TransferableHelper::getTransferData2( const DataFlavor& rFlavor, co } - Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -427,7 +419,6 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr } - sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -455,7 +446,6 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r } - void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -478,13 +468,11 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, } - void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -500,31 +488,26 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE } - void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) throw( RuntimeException, std::exception ) { } - sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException, std::exception ) { sal_Int64 nRet; @@ -541,7 +524,6 @@ sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& } - void TransferableHelper::ImplFlush() { if( mxClipboard.is() ) @@ -562,7 +544,6 @@ void TransferableHelper::ImplFlush() } - void TransferableHelper::AddFormat( SotClipboardFormatId nFormat ) { DataFlavor aFlavor; @@ -572,7 +553,6 @@ void TransferableHelper::AddFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) { bool bAdd = true; @@ -630,7 +610,6 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) } - void TransferableHelper::RemoveFormat( SotClipboardFormatId nFormat ) { DataFlavor aFlavor; @@ -640,7 +619,6 @@ void TransferableHelper::RemoveFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ); @@ -655,7 +633,6 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) } - bool TransferableHelper::HasFormat( SotClipboardFormatId nFormat ) { bool bRet = false; @@ -673,7 +650,6 @@ bool TransferableHelper::HasFormat( SotClipboardFormatId nFormat ) } - void TransferableHelper::ClearFormats() { mpFormats->clear(); @@ -681,7 +657,6 @@ void TransferableHelper::ClearFormats() } - bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) { maAny = rAny; @@ -689,7 +664,6 @@ bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) } - bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) { DataFlavor aFileFlavor; @@ -712,7 +686,6 @@ bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& r } - bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavor& rFlavor ) { if( !rBitmapEx.IsEmpty() ) @@ -741,7 +714,6 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo } - bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& ) { if( rMtf.GetActionSize() ) @@ -756,7 +728,6 @@ bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlav } - bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& ) { if( rGraphic.GetType() != GRAPHIC_NONE ) @@ -773,7 +744,6 @@ bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& } - bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatransfer::DataFlavor& ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -786,7 +756,6 @@ bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const css::datatran } - bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const css::datatransfer::DataFlavor& ) { @@ -801,7 +770,6 @@ bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObje } - bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, const css::datatransfer::DataFlavor& rFlavor ) { @@ -891,7 +859,6 @@ bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, } - bool TransferableHelper::SetINetImage( const INetImage& rINtImg, const css::datatransfer::DataFlavor& rFlavor ) { @@ -906,7 +873,6 @@ bool TransferableHelper::SetINetImage( const INetImage& rINtImg, } - bool TransferableHelper::SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const DataFlavor& rFlavor ) { tools::SvRef<SotStorageStream> xStm( new SotStorageStream( OUString() ) ); @@ -937,7 +903,6 @@ bool TransferableHelper::SetObject( void* pUserObject, SotClipboardFormatId nUse } - bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*, SotClipboardFormatId, const DataFlavor& ) { OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" ); @@ -945,19 +910,16 @@ bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*, So } - void TransferableHelper::DragFinished( sal_Int8 ) { } - void TransferableHelper::ObjectReleased() { } - void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDesc ) { delete mpObjDesc; @@ -968,7 +930,6 @@ void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDes } - void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -999,7 +960,6 @@ void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const } - void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -1027,7 +987,6 @@ void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const } - void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions, sal_Int32 nDnDPointer, sal_Int32 nDnDImage ) @@ -1071,7 +1030,6 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceAct } - void TransferableHelper::ClearSelection( vcl::Window *pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -1082,7 +1040,6 @@ void TransferableHelper::ClearSelection( vcl::Window *pWindow ) } - Reference< XClipboard> TransferableHelper::GetSystemClipboard() { vcl::Window *pFocusWindow = Application::GetFocusWindow(); @@ -1135,7 +1092,6 @@ public: }; - TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex ) :mrMutex( _rMutex ) ,mxNotifier( _rxClipboard, UNO_QUERY ) @@ -1153,7 +1109,6 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X } - void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -1167,7 +1122,6 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C } - void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) throw (RuntimeException, std::exception) { // clipboard is being disposed. Hmm. Okay, become disfunctional myself. @@ -1175,7 +1129,6 @@ void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) thr } - void TransferableClipboardNotifier::dispose() { ::osl::MutexGuard aGuard( mrMutex ); @@ -1216,7 +1169,6 @@ TransferableDataHelper::TransferableDataHelper() : } - TransferableDataHelper::TransferableDataHelper( const Reference< css::datatransfer::XTransferable >& rxTransferable ) : mxTransfer( rxTransferable ), mpFormats( new DataFlavorExVector ), @@ -1227,7 +1179,6 @@ TransferableDataHelper::TransferableDataHelper( const Reference< css::datatransf } - TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rDataHelper ) : mxTransfer( rDataHelper.mxTransfer ), mxClipboard( rDataHelper.mxClipboard ), @@ -1238,7 +1189,6 @@ TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rD } - TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDataHelper& rDataHelper ) { if ( this != &rDataHelper ) @@ -1263,7 +1213,6 @@ TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDat } - TransferableDataHelper::~TransferableDataHelper() { StopClipboardListening( ); @@ -1275,7 +1224,6 @@ TransferableDataHelper::~TransferableDataHelper() } - void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor >& rDataFlavorSeq, DataFlavorExVector& rDataFlavorExVector ) { @@ -1369,7 +1317,6 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor } - void TransferableDataHelper::InitFormats() { SolarMutexGuard aSolarGuard; @@ -1394,7 +1341,6 @@ void TransferableDataHelper::InitFormats() } - bool TransferableDataHelper::HasFormat( SotClipboardFormatId nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1415,7 +1361,6 @@ bool TransferableDataHelper::HasFormat( SotClipboardFormatId nFormat ) const } - bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1436,7 +1381,6 @@ bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const } - sal_uInt32 TransferableDataHelper::GetFormatCount() const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1444,8 +1388,6 @@ sal_uInt32 TransferableDataHelper::GetFormatCount() const } - - SotClipboardFormatId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1454,7 +1396,6 @@ SotClipboardFormatId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) con } - DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1469,7 +1410,6 @@ DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) con } - Reference< XTransferable > TransferableDataHelper::GetXTransferable() const { Reference< XTransferable > xRet; @@ -1494,7 +1434,6 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const } - Any TransferableDataHelper::GetAny( SotClipboardFormatId nFormat, const OUString& rDestDoc ) const { Any aReturn; @@ -1507,8 +1446,6 @@ Any TransferableDataHelper::GetAny( SotClipboardFormatId nFormat, const OUString } - - Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& rDestDoc ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -1557,7 +1494,6 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor, const OUString& r } - bool TransferableDataHelper::GetString( SotClipboardFormatId nFormat, OUString& rStr ) { DataFlavor aFlavor; @@ -1565,7 +1501,6 @@ bool TransferableDataHelper::GetString( SotClipboardFormatId nFormat, OUString& } - bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) { Any aAny = GetAny(rFlavor, OUString()); @@ -1601,7 +1536,6 @@ bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rSt } - bool TransferableDataHelper::GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx& rBmpEx ) { if(SotClipboardFormatId::BITMAP == nFormat) @@ -1623,7 +1557,6 @@ bool TransferableDataHelper::GetBitmapEx( SotClipboardFormatId nFormat, BitmapEx } - bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& rBmpEx ) { tools::SvRef<SotStorageStream> xStm; @@ -1727,7 +1660,6 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r } - bool TransferableDataHelper::GetGDIMetaFile(SotClipboardFormatId nFormat, GDIMetaFile& rMtf, size_t nMaxActions) { DataFlavor aFlavor; @@ -1737,7 +1669,6 @@ bool TransferableDataHelper::GetGDIMetaFile(SotClipboardFormatId nFormat, GDIMet } - bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) { tools::SvRef<SotStorageStream> xStm; @@ -1782,7 +1713,6 @@ bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaF } - bool TransferableDataHelper::GetGraphic( SotClipboardFormatId nFormat, Graphic& rGraphic ) { if(SotClipboardFormatId::BITMAP == nFormat) @@ -1804,7 +1734,6 @@ bool TransferableDataHelper::GetGraphic( SotClipboardFormatId nFormat, Graphic& } - bool TransferableDataHelper::GetGraphic( const css::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) { DataFlavor aFlavor; @@ -1857,7 +1786,6 @@ bool TransferableDataHelper::GetGraphic( const css::datatransfer::DataFlavor& rF } - bool TransferableDataHelper::GetImageMap( SotClipboardFormatId nFormat, ImageMap& rIMap ) { DataFlavor aFlavor; @@ -1865,7 +1793,6 @@ bool TransferableDataHelper::GetImageMap( SotClipboardFormatId nFormat, ImageMap } - bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) { tools::SvRef<SotStorageStream> xStm; @@ -1881,7 +1808,6 @@ bool TransferableDataHelper::GetImageMap( const css::datatransfer::DataFlavor& r } - bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormatId nFormat, TransferableObjectDescriptor& rDesc ) { DataFlavor aFlavor; @@ -1889,7 +1815,6 @@ bool TransferableDataHelper::GetTransferableObjectDescriptor( SotClipboardFormat } - bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc ) { rDesc = *mpObjDesc; @@ -1897,7 +1822,6 @@ bool TransferableDataHelper::GetTransferableObjectDescriptor( const css::datatra } - bool TransferableDataHelper::GetINetBookmark( SotClipboardFormatId nFormat, INetBookmark& rBmk ) { DataFlavor aFlavor; @@ -1905,7 +1829,6 @@ bool TransferableDataHelper::GetINetBookmark( SotClipboardFormatId nFormat, INet } - bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ) { bool bRet = false; @@ -2041,7 +1964,6 @@ bool TransferableDataHelper::GetINetBookmark( const css::datatransfer::DataFlavo } - bool TransferableDataHelper::GetINetImage( SotClipboardFormatId nFormat, INetImage& rINtImg ) { @@ -2050,7 +1972,6 @@ bool TransferableDataHelper::GetINetImage( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetINetImage( const css::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ) @@ -2064,7 +1985,6 @@ bool TransferableDataHelper::GetINetImage( } - bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat, FileList& rFileList ) { @@ -2073,7 +1993,6 @@ bool TransferableDataHelper::GetFileList( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetFileList( const css::datatransfer::DataFlavor&, FileList& rFileList ) @@ -2109,7 +2028,6 @@ bool TransferableDataHelper::GetFileList( } - Sequence<sal_Int8> TransferableDataHelper::GetSequence( SotClipboardFormatId nFormat, const OUString& rDestDoc ) { DataFlavor aFlavor; @@ -2134,7 +2052,6 @@ Sequence<sal_Int8> TransferableDataHelper::GetSequence( const DataFlavor& rFlavo } - bool TransferableDataHelper::GetSotStorageStream( SotClipboardFormatId nFormat, tools::SvRef<SotStorageStream>& rxStream ) { DataFlavor aFlavor; @@ -2142,7 +2059,6 @@ bool TransferableDataHelper::GetSotStorageStream( SotClipboardFormatId nFormat, } - bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, tools::SvRef<SotStorageStream>& rxStream ) { Sequence<sal_Int8> aSeq = GetSequence(rFlavor, OUString()); @@ -2184,7 +2100,6 @@ void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewCon } - bool TransferableDataHelper::StartClipboardListening( ) { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -2198,7 +2113,6 @@ bool TransferableDataHelper::StartClipboardListening( ) } - void TransferableDataHelper::StopClipboardListening( ) { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -2212,7 +2126,6 @@ void TransferableDataHelper::StopClipboardListening( ) } - TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::Window * pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -2245,8 +2158,6 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::W } - - TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window* pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 52689a26f9d7..b0e89e09308d 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -54,19 +54,16 @@ DragSourceHelper::DragGestureListener::DragGestureListener( DragSourceHelper& rD } - DragSourceHelper::DragGestureListener::~DragGestureListener() { } - void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -90,7 +87,6 @@ DragSourceHelper::DragSourceHelper( vcl::Window* pWindow ) : } - DragSourceHelper::~DragSourceHelper() { if( mxDragGestureRecognizer.is() ) @@ -98,7 +94,6 @@ DragSourceHelper::~DragSourceHelper() } - void DragSourceHelper::StartDrag( sal_Int8, const Point& ) { } @@ -114,20 +109,17 @@ DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDro } - DropTargetHelper::DropTargetListener::~DropTargetListener() { delete mpLastDragOverEvent; } - void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } - void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -177,7 +169,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv } - void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -194,7 +185,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD } - void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -219,7 +209,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr } - void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException, std::exception ) { const SolarMutexGuard aGuard; @@ -242,8 +231,6 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv } - - void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) throw( RuntimeException, std::exception ) { } @@ -260,7 +247,6 @@ DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) : } - DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget ) : mxDropTarget( rxDropTarget ), mpFormats( new DataFlavorExVector ) @@ -269,7 +255,6 @@ DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget } - DropTargetHelper::~DropTargetHelper() { if( mxDropTarget.is() ) @@ -279,7 +264,6 @@ DropTargetHelper::~DropTargetHelper() } - void DropTargetHelper::ImplConstruct() { if( mxDropTarget.is() ) @@ -291,7 +275,6 @@ void DropTargetHelper::ImplConstruct() } - void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDataFlavors ) { mpFormats->clear(); @@ -299,28 +282,24 @@ void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDa } - void DropTargetHelper::ImplEndDrag() { mpFormats->clear(); } - sal_Int8 DropTargetHelper::AcceptDrop( const AcceptDropEvent& ) { return( DNDConstants::ACTION_NONE ); } - sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& ) { return( DNDConstants::ACTION_NONE ); } - bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); @@ -339,7 +318,6 @@ bool DropTargetHelper::IsDropFormatSupported( SotClipboardFormatId nFormat ) } - // TransferDataContainer @@ -350,11 +328,9 @@ struct TDataCntnrEntry_Impl }; - typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList; - struct TransferDataContainer_Impl { TDataCntnrEntryList aFmtList; @@ -375,27 +351,23 @@ struct TransferDataContainer_Impl }; - TransferDataContainer::TransferDataContainer() : pImpl( new TransferDataContainer_Impl ) { } - TransferDataContainer::~TransferDataContainer() { delete pImpl; } - void TransferDataContainer::AddSupportedFormats() { } - bool TransferDataContainer::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ ) { @@ -443,7 +415,6 @@ bool TransferDataContainer::GetData( } - void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) { if( !pImpl->pBookmk ) @@ -460,7 +431,6 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) } - void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, const sal_Char* pData, sal_uLong nLen ) { @@ -478,7 +448,6 @@ void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, } - void TransferDataContainer::CopyByteString( SotClipboardFormatId nFormatId, const OString& rStr ) { @@ -486,7 +455,6 @@ void TransferDataContainer::CopyByteString( SotClipboardFormatId nFormatId, } - void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) { SvMemoryStream aMemStm( 1024, 1024 ); @@ -497,7 +465,6 @@ void TransferDataContainer::CopyINetImage( const INetImage& rINtImg ) } - void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -508,7 +475,6 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap ) } - void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) { GraphicType nType = rGrf.GetType(); @@ -534,7 +500,6 @@ void TransferDataContainer::CopyGraphic( const Graphic& rGrf ) } - void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUString& rStr ) { if( !rStr.isEmpty() ) @@ -549,14 +514,12 @@ void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUStrin } - void TransferDataContainer::CopyString( const OUString& rStr ) { CopyString( SotClipboardFormatId::STRING, rStr ); } - void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt, const css::uno::Any& rAny ) { @@ -568,7 +531,6 @@ void TransferDataContainer::CopyAny( SotClipboardFormatId nFmt, } - bool TransferDataContainer::HasAnyData() const { return pImpl->aFmtList.begin() != pImpl->aFmtList.end() || @@ -576,7 +538,6 @@ bool TransferDataContainer::HasAnyData() const } - void TransferDataContainer::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link<sal_Int8,void>& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) @@ -587,7 +548,6 @@ void TransferDataContainer::StartDrag( } - void TransferDataContainer::DragFinished( sal_Int8 nDropAction ) { pImpl->aFinshedLnk.Call( nDropAction ); diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 190cb0f8d05b..dd13dad23701 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -20,7 +20,6 @@ #include <svtools/unitconv.hxx> - void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) { sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); @@ -80,7 +79,6 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll ) } - void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, bool bAll ) { sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) ); @@ -126,7 +124,6 @@ void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit ) } - long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) { sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM ); @@ -152,7 +149,6 @@ long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit ) } - long CalcToUnit( float nIn, SfxMapUnit eUnit ) { // nIn ist in Points @@ -184,7 +180,6 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) } - long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) { long nOut = 0; @@ -241,14 +236,12 @@ long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) } - long ControlToItem( long nIn, FieldUnit eCtrl, SfxMapUnit eItem ) { return ItemToControl( nIn, eItem, eCtrl ); } - FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) { switch ( eUnit ) @@ -278,7 +271,6 @@ FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ) } - long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) { DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || @@ -317,7 +309,6 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ) } - long CMToTwips( long nIn ) { long nRet = 0; @@ -328,7 +319,6 @@ long CMToTwips( long nIn ) } - long MMToTwips( long nIn ) { long nRet = 0; @@ -339,7 +329,6 @@ long MMToTwips( long nIn ) } - long InchToTwips( long nIn ) { long nRet = 0; @@ -350,7 +339,6 @@ long InchToTwips( long nIn ) } - long PointToTwips( long nIn ) { long nRet = 0; @@ -361,7 +349,6 @@ long PointToTwips( long nIn ) } - long PicaToTwips( long nIn ) { long nRet = 0; @@ -372,7 +359,6 @@ long PicaToTwips( long nIn ) } - long TwipsToCM( long nIn ) { long nRet = nIn / 567; @@ -380,7 +366,6 @@ long TwipsToCM( long nIn ) } - long InchToCM( long nIn ) { long nRet = 0; @@ -391,7 +376,6 @@ long InchToCM( long nIn ) } - long MMToCM( long nIn ) { long nRet = nIn / 10; @@ -399,7 +383,6 @@ long MMToCM( long nIn ) } - long PointToCM( long nIn ) { long nRet = 0; @@ -410,7 +393,6 @@ long PointToCM( long nIn ) } - long PicaToCM( long nIn) { long nRet = 0; @@ -421,7 +403,6 @@ long PicaToCM( long nIn) } - long TwipsToMM( long nIn ) { long nRet = 0; @@ -432,7 +413,6 @@ long TwipsToMM( long nIn ) } - long CMToMM( long nIn ) { long nRet = 0; @@ -443,7 +423,6 @@ long CMToMM( long nIn ) } - long InchToMM( long nIn ) { long nRet = 0; @@ -454,7 +433,6 @@ long InchToMM( long nIn ) } - long PointToMM( long nIn ) { long nRet = 0; @@ -465,7 +443,6 @@ long PointToMM( long nIn ) } - long PicaToMM( long nIn ) { long nRet = 0; @@ -476,7 +453,6 @@ long PicaToMM( long nIn ) } - long TwipsToInch( long nIn ) { long nRet = nIn / 1440; @@ -484,7 +460,6 @@ long TwipsToInch( long nIn ) } - long CMToInch( long nIn ) { long nRet = 0; @@ -495,7 +470,6 @@ long CMToInch( long nIn ) } - long MMToInch( long nIn ) { long nRet = 0; @@ -506,7 +480,6 @@ long MMToInch( long nIn ) } - long PointToInch( long nIn ) { long nRet = nIn / 72; @@ -514,7 +487,6 @@ long PointToInch( long nIn ) } - long PicaToInch( long nIn ) { long nRet = nIn / 6; @@ -522,7 +494,6 @@ long PicaToInch( long nIn ) } - long TwipsToPoint( long nIn ) { long nRet = nIn / 20; @@ -530,7 +501,6 @@ long TwipsToPoint( long nIn ) } - long InchToPoint( long nIn ) { long nRet = 0; @@ -541,7 +511,6 @@ long InchToPoint( long nIn ) } - long CMToPoint( long nIn ) { long nRet = 0; @@ -552,7 +521,6 @@ long CMToPoint( long nIn ) } - long MMToPoint( long nIn ) { long nRet = 0; @@ -563,7 +531,6 @@ long MMToPoint( long nIn ) } - long PicaToPoint( long nIn ) { long nRet = nIn / 12; @@ -571,7 +538,6 @@ long PicaToPoint( long nIn ) } - long TwipsToPica( long nIn ) { long nRet = nIn / 240; @@ -579,7 +545,6 @@ long TwipsToPica( long nIn ) } - long InchToPica( long nIn ) { long nRet = 0; @@ -590,7 +555,6 @@ long InchToPica( long nIn ) } - long PointToPica( long nIn ) { long nRet = 0; @@ -601,7 +565,6 @@ long PointToPica( long nIn ) } - long CMToPica( long nIn ) { long nRet = 0; @@ -612,7 +575,6 @@ long CMToPica( long nIn ) } - long MMToPica( long nIn ) { long nRet = 0; @@ -623,7 +585,6 @@ long MMToPica( long nIn ) } - long Nothing( long nIn ) { long nRet = nIn; @@ -642,7 +603,6 @@ FUNC_CONVERT ConvertTable[6][6] = }; - long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) { if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx index fd862053606d..96ab3b4e8535 100644 --- a/svtools/source/misc/xwindowitem.cxx +++ b/svtools/source/misc/xwindowitem.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; - - XWindowItem::XWindowItem() : SfxPoolItem() { @@ -61,7 +59,4 @@ bool XWindowItem::operator == ( const SfxPoolItem & rAttr ) const } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index a907500c974c..f6f75eb73162 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -52,8 +52,6 @@ SvRTFParser::~SvRTFParser() } - - int SvRTFParser::_GetNextToken() { int nRet = 0; diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 922d2ebbec12..250f9e6bb785 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -179,5 +179,4 @@ SvStream& RTFOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLe } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 657a35539a89..b5c377b72ea0 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -58,7 +58,6 @@ struct SvParser_Impl }; - // Construktor SvParser::SvParser( SvStream& rIn, sal_uInt8 nStackSize ) : rInput( rIn ) diff --git a/svtools/source/table/cellvalueconversion.hxx b/svtools/source/table/cellvalueconversion.hxx index 17163b6ef7f8..4688e3b06c7f 100644 --- a/svtools/source/table/cellvalueconversion.hxx +++ b/svtools/source/table/cellvalueconversion.hxx @@ -30,7 +30,6 @@ namespace svt { - //= CellValueConversion struct CellValueConversion_Data; diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx index ffd035e71725..3d88c1574e85 100644 --- a/svtools/source/table/mousefunction.cxx +++ b/svtools/source/table/mousefunction.cxx @@ -29,7 +29,6 @@ namespace svt { namespace table { - //= ColumnResize diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 1f5061153597..867b2f52ade2 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -120,7 +120,6 @@ namespace svt { namespace table } - void TableControl::StateChanged( StateChangedType i_nStateChange ) { Control::StateChanged( i_nStateChange ); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index eb34cda6d2fe..0b8795574aef 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -477,7 +477,6 @@ namespace svt { namespace table }; - } } // namespace svt::table diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx index 3cb33db0ecb0..519162f1b428 100644 --- a/svtools/source/table/tablegeometry.cxx +++ b/svtools/source/table/tablegeometry.cxx @@ -26,7 +26,6 @@ namespace svt { namespace table { - //= TableRowGeometry diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 65b365bc0542..ad8d7ea903f0 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -45,7 +45,6 @@ namespace svt { - OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext) :OPropertyContainer(GetBroadcastHelper()) ,m_pDialog(nullptr) diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 37038d165c18..494b466fb529 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -671,7 +671,6 @@ void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& ) throw (R } - void SAL_CALL SVTXGridControl::disposing( const EventObject& Source ) throw(RuntimeException, std::exception) { VCLXWindow::disposing( Source ); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index b45f5abff8bb..c58db093f33d 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -675,7 +675,6 @@ void ToolboxController::updateStatus( const OUString& aCommandURL ) } - void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequence< PropertyValue >& rArgs, const OUString &sTarget ) { try @@ -699,7 +698,6 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ } - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ToolboxController::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) { Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); @@ -762,7 +760,6 @@ throw( css::uno::Exception, std::exception) } - IMPL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, p, void ) { DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index d9b9cced06ff..a57c40045054 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -68,8 +68,6 @@ public: }; - - class ImplContextGraphicItem : public SvLBoxContextBmp { public: @@ -81,7 +79,6 @@ public: }; - class UnoTreeListBoxImpl : public SvTreeListBox { public: @@ -105,7 +102,6 @@ private: }; - class UnoTreeListItem : public SvLBoxString { public: @@ -127,7 +123,6 @@ private: }; - class UnoTreeListEntry : public SvTreeListEntry { public: @@ -150,7 +145,6 @@ TreeControlPeer::TreeControlPeer() } - TreeControlPeer::~TreeControlPeer() { if( mpTreeImpl ) @@ -159,7 +153,6 @@ TreeControlPeer::~TreeControlPeer() } - void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) { if( pEntry && pEntry->mxNode.is() ) @@ -174,7 +167,6 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) } - void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) { if( mpTreeNodeMap && pEntry && pEntry->mxNode.is() ) @@ -188,7 +180,6 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) } - UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) throw( IllegalArgumentException ) { if( mpTreeNodeMap ) @@ -205,7 +196,6 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode } - vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ) { mpTreeImpl = VclPtr<UnoTreeListBoxImpl>::Create( this, pParent, nWinStyle ); @@ -213,7 +203,6 @@ vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 } - /** called from the UnoTreeListBoxImpl when it gets deleted */ void TreeControlPeer::disposeControl() { @@ -223,14 +212,12 @@ void TreeControlPeer::disposeControl() } - void TreeControlPeer::SetWindow( const VclPtr< vcl::Window > &pWindow ) { VCLXWindow::SetWindow( pWindow ); } - UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = TREELIST_APPEND */ ) { UnoTreeListEntry* pEntry = nullptr; @@ -340,7 +327,6 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) } - void TreeControlPeer::onSelectionChanged() { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -349,7 +335,6 @@ void TreeControlPeer::onSelectionChanged() } - void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) { try @@ -364,7 +349,6 @@ void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) } - bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bExpanding ) { try @@ -388,7 +372,6 @@ bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bEx } - void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExpanding ) { try @@ -411,7 +394,6 @@ void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExp } - void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTreeDataModel >& xDataModel ) { rTree.Clear(); @@ -436,7 +418,6 @@ void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTre } - void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParentEntry ) { if( xNode.is() ) @@ -449,7 +430,6 @@ void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTree } - UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (RuntimeException ) { if( !mpTreeImpl ) @@ -458,7 +438,6 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim } - void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException ) { SolarMutexGuard aGuard; @@ -528,7 +507,6 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega } - Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -564,14 +542,12 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::excep } - void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); } - void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); @@ -588,14 +564,12 @@ sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw ( } - void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { ChangeNodesSelection( rSelection, false, false ); } - void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -603,7 +577,6 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::ex } - sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -611,7 +584,6 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, } - class TreeSelectionEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { public: @@ -624,7 +596,6 @@ public: }; - TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection ) { maSelection.swap( rSelection ); @@ -632,14 +603,12 @@ TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection } - sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() throw (RuntimeException, std::exception) { return maIter != maSelection.end(); } - Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { if( maIter == maSelection.end() ) @@ -649,7 +618,6 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti } - Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -673,7 +641,6 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() } - Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -707,7 +674,6 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (css::un } - void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -737,7 +703,6 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe } - OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -745,7 +710,6 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::u } - void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -775,7 +739,6 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD } - sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -786,7 +749,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& } - sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -794,7 +756,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode > } - void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -806,7 +767,6 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN } - sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -817,7 +777,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& } - void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -829,7 +788,6 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) } - void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -841,21 +799,18 @@ void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode } - void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.addInterface( xListener ); } - void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.removeInterface( xListener ); } - Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -873,7 +828,6 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x } - Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -891,7 +845,6 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_ } - awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -904,7 +857,6 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode } - sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -914,7 +866,6 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::e } - sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -932,7 +883,6 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::e } - void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -942,7 +892,6 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::e } - void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1492,7 +1441,6 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pPa } - UnoTreeListBoxImpl::~UnoTreeListBoxImpl() { disposeOnce(); @@ -1506,7 +1454,6 @@ void UnoTreeListBoxImpl::dispose() } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) { if( mxPeer.is() ) @@ -1514,7 +1461,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1527,7 +1473,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1548,7 +1493,6 @@ sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* } - void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( pParent ); @@ -1557,14 +1501,12 @@ void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) } - bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { return mxPeer.is() && mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ); } - bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { return mxPeer.is() && mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ); @@ -1580,20 +1522,17 @@ UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry ) } - UnoTreeListItem::UnoTreeListItem() : SvLBoxString() { } - UnoTreeListItem::~UnoTreeListItem() { } - void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { @@ -1610,14 +1549,12 @@ void UnoTreeListItem::Paint( } - SvLBoxItem* UnoTreeListItem::Create() const { return new UnoTreeListItem; } - void UnoTreeListItem::Clone( SvLBoxItem* pSource ) { UnoTreeListItem* pSourceItem = dynamic_cast< UnoTreeListItem* >( pSource ); @@ -1629,24 +1566,18 @@ void UnoTreeListItem::Clone( SvLBoxItem* pSource ) } - void UnoTreeListItem::SetImage( const Image& rImage ) { maImage = rImage; } - - - - void UnoTreeListItem::SetGraphicURL( const OUString& rGraphicURL ) { maGraphicURL = rGraphicURL; } - void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) @@ -1668,7 +1599,6 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry } - UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer ) : SvTreeListEntry() , mxNode( xNode ) @@ -1679,7 +1609,6 @@ UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeCon } - UnoTreeListEntry::~UnoTreeListEntry() { if( mpPeer ) diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx index 2ffc749f97fa..0f859c8279cd 100644 --- a/svtools/source/uno/unocontroltablemodel.hxx +++ b/svtools/source/uno/unocontroltablemodel.hxx @@ -42,7 +42,6 @@ namespace svt { namespace table { - //= UnoControlTableModel class UnoGridColumnFacade; diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 56e6ccb93b56..3e89429f95e8 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -550,5 +550,4 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx index 2aa3091b7f4b..aed237624447 100644 --- a/svtools/source/uno/unogridcolumnfacade.hxx +++ b/svtools/source/uno/unogridcolumnfacade.hxx @@ -36,7 +36,6 @@ namespace svt { namespace table { - //= UnoGridColumnFacade class ColumnChangeMultiplexer; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 7946fda76724..8d5db2fd8c66 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -806,7 +806,6 @@ void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class SVTXFormattedField @@ -1296,8 +1295,6 @@ void SVTXFormattedField::SetValue(const css::uno::Any& rValue) } - - void SVTXFormattedField::setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier) { FormattedField* pField = GetAs< FormattedField >(); @@ -1401,7 +1398,6 @@ void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class SVTXRoadmap using namespace svt; @@ -1553,8 +1549,6 @@ void SVTXRoadmap::elementReplaced( const css::container::ContainerEvent& _rEvent } - - void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any& Value) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1609,7 +1603,6 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const css::uno::Any } - css::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2058,7 +2051,6 @@ void SVTXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class VCLXProgressBar @@ -2306,7 +2298,6 @@ void VCLXProgressBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } - // class SVTXDateField SVTXDateField::SVTXDateField() diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 75d18ce5a3db..d7fef225e35c 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -518,7 +518,6 @@ Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents() } - class SvUnoImageMap : public WeakImplHelper< XIndexContainer, XServiceInfo, XUnoTunnel > { public: diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 720446d699a6..d04958b3b26c 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -27,7 +27,6 @@ #define S_THUMB 80 - enum GalSoundType { SOUND_STANDARD = 0, diff --git a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx index 4b9dc9947d20..672277cda1dc 100644 --- a/svx/inc/sdr/attribute/sdrfilltextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrfilltextattribute.hxx @@ -26,7 +26,6 @@ #include <svx/sdr/attribute/sdrtextattribute.hxx> - namespace drawinglayer { namespace attribute @@ -59,7 +58,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx index 121f45b91f00..e2e4aaac60c7 100644 --- a/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx @@ -32,7 +32,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace attribute @@ -71,7 +70,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx index ab97e4896914..7a7f30140d21 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dcube.hxx @@ -49,7 +49,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx index 20a73ae946fa..1538a18c983e 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dextrude.hxx @@ -50,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx index cedaa2563d00..04df07a143b5 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dlathe.hxx @@ -50,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx index 2544414ab665..5c867e40a90c 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx @@ -49,7 +49,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx index 1ea99d3f461e..1669c67d5d6f 100644 --- a/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/sdr/contact/viewcontactofe3dsphere.hxx @@ -50,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofgroup.hxx b/svx/inc/sdr/contact/viewcontactofgroup.hxx index db910e40d090..af20acec7391 100644 --- a/svx/inc/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/sdr/contact/viewcontactofgroup.hxx @@ -56,7 +56,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx index 7dfea4e176d2..fd8eb73c5755 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -51,7 +51,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx index d64615a36d00..6d39c7f0582d 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrcircobj.hxx @@ -51,7 +51,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx index 87b432ebf889..29e76f32a8fa 100644 --- a/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdredgeobj.hxx @@ -51,7 +51,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx index 6d2ab6645231..5e4fef89b39c 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -51,7 +51,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx index df30d0f9f2fb..c01aa0ccdac2 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -54,7 +54,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx index 13ab44e81c38..b72f25db13f3 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx @@ -73,7 +73,6 @@ protected: }} - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx index b45444507598..c1ab456d0f99 100644 --- a/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/sdr/contact/viewcontactofsdrpathobj.hxx @@ -51,7 +51,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index a2d8d3173d13..4e02fe3ec70a 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -40,7 +40,6 @@ namespace com { namespace sun { namespace star { namespace sdr { namespace contact { - //= ViewContactOfUnoControl class ViewContactOfUnoControl_Impl; diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx index 1745ff987a0c..13d6e58abead 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -24,7 +24,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - namespace sdr { namespace contact @@ -48,7 +47,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index a7f5bf9cb0a7..9feef60759d9 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -60,7 +60,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/overlay/overlaycrosshair.hxx b/svx/inc/sdr/overlay/overlaycrosshair.hxx index afe49f76849a..33eca67f97c7 100644 --- a/svx/inc/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/sdr/overlay/overlaycrosshair.hxx @@ -23,7 +23,6 @@ #include <svx/sdr/overlay/overlayobject.hxx> - namespace sdr { namespace overlay @@ -45,7 +44,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/overlay/overlayhelpline.hxx b/svx/inc/sdr/overlay/overlayhelpline.hxx index 054d348b24cd..b7f2a32bbf7e 100644 --- a/svx/inc/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/sdr/overlay/overlayhelpline.hxx @@ -24,7 +24,6 @@ #include <svx/svdhlpln.hxx> - namespace sdr { namespace overlay @@ -54,7 +53,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYHELPLINE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/overlay/overlayline.hxx b/svx/inc/sdr/overlay/overlayline.hxx index 9738a8d0a936..629d4929fb2b 100644 --- a/svx/inc/sdr/overlay/overlayline.hxx +++ b/svx/inc/sdr/overlay/overlayline.hxx @@ -23,7 +23,6 @@ #include <svx/sdr/overlay/overlayobject.hxx> - namespace sdr { namespace overlay @@ -53,7 +52,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYLINE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 4a16c80fb890..dcebfce2e91c 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -26,7 +26,6 @@ #include <vcl/idle.hxx> - namespace sdr { namespace overlay @@ -92,7 +91,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx index ffc3eeceb195..72c9b5dcf18b 100644 --- a/svx/inc/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/sdr/overlay/overlayrollingrectangle.hxx @@ -23,7 +23,6 @@ #include <svx/sdr/overlay/overlayobject.hxx> - namespace sdr { namespace overlay @@ -69,7 +68,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx index f5b8c96de422..93b341d90af8 100644 --- a/svx/inc/sdr/overlay/overlaytools.hxx +++ b/svx/inc/sdr/overlay/overlaytools.hxx @@ -305,7 +305,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_OVERLAY_OVERLAYTOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index 2fd8ac5e9839..3a844c21f988 100644 --- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -29,7 +29,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -72,7 +71,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 6a3ef322b0bf..f3a503e37a8f 100644 --- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -28,7 +28,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -62,7 +61,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index f1780e817141..45107acaf65e 100644 --- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -28,7 +28,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -83,7 +82,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index bc17ca962768..f049710a02bb 100644 --- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -28,7 +28,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -62,7 +61,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -100,7 +98,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx index 4275261ce202..a6489664c131 100644 --- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -29,7 +29,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -70,7 +69,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 483a623d2d39..72bb1a029c1b 100644 --- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -41,7 +41,6 @@ namespace drawinglayer { namespace attribute { }} - namespace drawinglayer { namespace primitive2d @@ -119,7 +118,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx index 14a42031ed3e..623cd7576796 100644 --- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx @@ -28,7 +28,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -64,7 +63,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx index c8e6e54fb844..5c8799d9cbbd 100644 --- a/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -30,7 +30,6 @@ class SdrOle2Obj; - namespace drawinglayer { namespace primitive2d @@ -74,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx index b997cace727b..c9f8b84a657d 100644 --- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -29,7 +29,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -66,7 +65,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx index 969cfd20a70c..41217d3c2d5c 100644 --- a/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/sdr/primitive2d/sdrprimitivetools.hxx @@ -43,7 +43,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index eb4bd91c14c4..fa3a3706192d 100644 --- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -28,7 +28,6 @@ // predefines - namespace drawinglayer { namespace primitive2d @@ -74,7 +73,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index eced60a7849a..7e6a453351ed 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -35,7 +35,6 @@ class SdrText; - namespace drawinglayer { namespace primitive2d @@ -103,7 +102,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -145,7 +143,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -187,7 +184,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -249,7 +245,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -291,7 +286,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -368,8 +362,6 @@ namespace drawinglayer } // end of namespace drawinglayer - - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx index f0b8d8f3e635..cf5ee75689ae 100644 --- a/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/svx/inc/sdr/primitive3d/sdrattributecreator3d.hxx @@ -35,7 +35,6 @@ namespace basegfx { } - namespace drawinglayer { namespace primitive2d @@ -49,7 +48,6 @@ namespace drawinglayer } // end of namespace drawinglayer - #endif // INCLUDED_SVX_INC_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx index 8f2431717c39..d8a9bc54b88a 100644 --- a/svx/inc/sdr/properties/attributeproperties.hxx +++ b/svx/inc/sdr/properties/attributeproperties.hxx @@ -25,7 +25,6 @@ #include <svx/sdr/properties/defaultproperties.hxx> - namespace sdr { namespace properties @@ -89,7 +88,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx index a9b26f266c6f..973741ecedfe 100644 --- a/svx/inc/sdr/properties/captionproperties.hxx +++ b/svx/inc/sdr/properties/captionproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/rectangleproperties.hxx> - namespace sdr { namespace properties @@ -61,7 +60,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx index 50d315cc9168..ec06c55cf459 100644 --- a/svx/inc/sdr/properties/circleproperties.hxx +++ b/svx/inc/sdr/properties/circleproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/rectangleproperties.hxx> - namespace sdr { namespace properties @@ -61,7 +60,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx index d5ff377e6179..821d7ea3fb18 100644 --- a/svx/inc/sdr/properties/connectorproperties.hxx +++ b/svx/inc/sdr/properties/connectorproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/textproperties.hxx> - namespace sdr { namespace properties @@ -57,7 +56,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx index 62821a5d6e1e..457398408cb4 100644 --- a/svx/inc/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/sdr/properties/customshapeproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/textproperties.hxx> - namespace sdr { namespace properties @@ -85,7 +84,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx index 788ce8323ab6..a26dd4b0815a 100644 --- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> - namespace sdr { namespace properties @@ -65,7 +64,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx index 1f3d9bf2ab1c..e846203b90db 100644 --- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/e3dcompoundproperties.hxx> - namespace sdr { namespace properties @@ -51,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx index 9221816a10df..7ed1c77952c7 100644 --- a/svx/inc/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/e3dcompoundproperties.hxx> - namespace sdr { namespace properties @@ -51,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/e3dproperties.hxx b/svx/inc/sdr/properties/e3dproperties.hxx index aee3be1e784e..34f554b1cfa5 100644 --- a/svx/inc/sdr/properties/e3dproperties.hxx +++ b/svx/inc/sdr/properties/e3dproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/attributeproperties.hxx> - namespace sdr { namespace properties @@ -57,7 +56,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx index 732259522dca..3a2e98a9ddb7 100644 --- a/svx/inc/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/e3dproperties.hxx> - namespace sdr { namespace properties @@ -82,7 +81,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx index 7fecf0cb42cd..0a08f57c3abd 100644 --- a/svx/inc/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/e3dcompoundproperties.hxx> - namespace sdr { namespace properties @@ -51,7 +50,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx index dc5126216b3b..202807759775 100644 --- a/svx/inc/sdr/properties/emptyproperties.hxx +++ b/svx/inc/sdr/properties/emptyproperties.hxx @@ -23,7 +23,6 @@ #include <svx/sdr/properties/properties.hxx> - namespace sdr { namespace properties diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx index c8d7b1fa3603..768ef386dfc4 100644 --- a/svx/inc/sdr/properties/graphicproperties.hxx +++ b/svx/inc/sdr/properties/graphicproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/rectangleproperties.hxx> - namespace sdr { namespace properties @@ -61,7 +60,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx index 22c1b2c86356..a9f44817b162 100644 --- a/svx/inc/sdr/properties/groupproperties.hxx +++ b/svx/inc/sdr/properties/groupproperties.hxx @@ -23,7 +23,6 @@ #include <svx/sdr/properties/defaultproperties.hxx> - namespace sdr { namespace properties @@ -115,7 +114,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_GROUPPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx index 4fce2bb48beb..908aa2128c86 100644 --- a/svx/inc/sdr/properties/measureproperties.hxx +++ b/svx/inc/sdr/properties/measureproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/textproperties.hxx> - namespace sdr { namespace properties @@ -61,7 +60,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_MEASUREPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx index d6791cc3f11d..00cdb4045ed3 100644 --- a/svx/inc/sdr/properties/oleproperties.hxx +++ b/svx/inc/sdr/properties/oleproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/rectangleproperties.hxx> - namespace sdr { namespace properties @@ -52,7 +51,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_OLEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx index c503d3bf8f84..c6e9d303856d 100644 --- a/svx/inc/sdr/properties/pageproperties.hxx +++ b/svx/inc/sdr/properties/pageproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/emptyproperties.hxx> - namespace sdr { namespace properties @@ -67,7 +66,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_INC_SDR_PROPERTIES_PAGEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/rectangleproperties.hxx b/svx/inc/sdr/properties/rectangleproperties.hxx index 925c5c4b53e7..9e50b549f0f3 100644 --- a/svx/inc/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/sdr/properties/rectangleproperties.hxx @@ -23,7 +23,6 @@ #include <sdr/properties/textproperties.hxx> - namespace sdr { namespace properties @@ -54,7 +53,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx index 4bbcf5e81e41..a7f88280706d 100644 --- a/svx/inc/sdr/properties/textproperties.hxx +++ b/svx/inc/sdr/properties/textproperties.hxx @@ -24,7 +24,6 @@ #include <sdr/properties/attributeproperties.hxx> - namespace sdr { namespace properties @@ -86,7 +85,6 @@ namespace sdr } // end of namespace sdr - #endif // INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index aa0cf766c32b..afff950c6d9a 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -75,7 +75,6 @@ public: }; - #endif // INCLUDED_SVX_INC_XPOLYIMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 58ce8a299b06..3d70db02ae8a 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -18,8 +18,6 @@ */ - - // Global header @@ -31,11 +29,9 @@ #include <svx/svdpool.hxx> - // Project-local header - #include "AccessibleEmptyEditSource.hxx" #include <svx/unoshtxt.hxx> @@ -215,7 +211,6 @@ namespace accessibility } - // Implementing AccessibleEmptyEditSource @@ -338,5 +333,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 3a85aa885a4d..c4ccc90d43a8 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -75,14 +75,12 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB } - AccFrameSelector::~AccFrameSelector() { RemoveFrameSelEventListener(); } - void AccFrameSelector::RemoveFrameSelEventListener() { if ( mpFrameSel ) @@ -92,7 +90,6 @@ void AccFrameSelector::RemoveFrameSelEventListener() } - Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) throw (RuntimeException, std::exception) { @@ -100,7 +97,6 @@ Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) } - sal_Int32 AccFrameSelector::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -305,7 +301,6 @@ css::awt::Rectangle AccFrameSelector::getBounds( ) throw (RuntimeException, std } - css::awt::Point AccFrameSelector::getLocation( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -325,7 +320,6 @@ css::awt::Point AccFrameSelector::getLocation( ) throw (RuntimeException, std:: } - css::awt::Point AccFrameSelector::getLocationOnScreen( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -346,7 +340,6 @@ css::awt::Point AccFrameSelector::getLocationOnScreen( ) throw (RuntimeExceptio } - css::awt::Size AccFrameSelector::getSize( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -487,7 +480,6 @@ void AccFrameSelector::NotifyFocusListeners(bool bGetFocus) } - IMPL_LINK_TYPED( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void ) { vcl::Window* pWindow = rEvent.GetWindow(); @@ -499,7 +491,6 @@ IMPL_LINK_TYPED( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, } - void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -532,7 +523,6 @@ void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent } - void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, const Any& _rOldValue, const Any& _rNewValue ) { @@ -545,7 +535,6 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId, } - void AccFrameSelector::Invalidate() { RemoveFrameSelEventListener(); @@ -558,7 +547,6 @@ void AccFrameSelector::Invalidate() } - } } diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index c75bad34685c..49cdd0e21ddd 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -39,8 +39,6 @@ AccessibleGraphicShape::AccessibleGraphicShape ( } - - AccessibleGraphicShape::~AccessibleGraphicShape() { } @@ -55,8 +53,6 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription() } - - sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() throw (css::uno::RuntimeException, std::exception) { @@ -64,8 +60,6 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() } - - sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth() throw (css::uno::RuntimeException, std::exception) { @@ -85,7 +79,6 @@ css::uno::Any SAL_CALL } - void SAL_CALL AccessibleGraphicShape::acquire() throw () @@ -94,7 +87,6 @@ void SAL_CALL } - void SAL_CALL AccessibleGraphicShape::release() throw () @@ -111,8 +103,6 @@ OUString SAL_CALL } - - css::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) @@ -148,8 +138,6 @@ uno::Sequence<uno::Type> SAL_CALL } - - /// Create the base name of this object, i.e. the name without appended number. OUString AccessibleGraphicShape::CreateAccessibleBaseName() diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 4577ccf6bb1a..e41fa8f1af61 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -39,8 +39,6 @@ AccessibleOLEShape::AccessibleOLEShape ( } - - AccessibleOLEShape::~AccessibleOLEShape() { } @@ -53,8 +51,6 @@ sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount() } - - sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -62,8 +58,6 @@ sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/) } - - OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) @@ -72,8 +66,6 @@ OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 } - - Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActionKeyBinding (sal_Int32 /*nIndex*/) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) @@ -94,7 +86,6 @@ css::uno::Any SAL_CALL } - void SAL_CALL AccessibleOLEShape::acquire() throw () @@ -103,7 +94,6 @@ void SAL_CALL } - void SAL_CALL AccessibleOLEShape::release() throw () @@ -120,8 +110,6 @@ OUString SAL_CALL } - - css::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index bc681c08324d..a83ac75b11c2 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -36,8 +36,6 @@ AccessibleShapeInfo::AccessibleShapeInfo ( } - - AccessibleShapeInfo::AccessibleShapeInfo ( const css::uno::Reference<css::drawing::XShape>& rxShape, const css::uno::Reference<css::accessibility::XAccessible>& rxParent, diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 1576ecf72c01..66521432973e 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -37,8 +37,6 @@ AccessibleShapeTreeInfo::AccessibleShapeTreeInfo() } - - AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (const AccessibleShapeTreeInfo& rInfo) : mxDocumentWindow (rInfo.mxDocumentWindow), mxModelBroadcaster (rInfo.mxModelBroadcaster), @@ -51,8 +49,6 @@ AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (const AccessibleShapeTreeInfo& } - - AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleShapeTreeInfo& rInfo) { if ( this != &rInfo ) @@ -68,8 +64,6 @@ AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleSha } - - AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo() { SolarMutexGuard g; @@ -77,8 +71,6 @@ AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo() } - - void AccessibleShapeTreeInfo::SetDocumentWindow ( const Reference<XAccessibleComponent>& rxDocumentWindow) { @@ -93,24 +85,12 @@ void AccessibleShapeTreeInfo::SetModelBroadcaster ( } - - - - - - void AccessibleShapeTreeInfo::SetSdrView (SdrView* pView) { mpView = pView; } - - - - - - void AccessibleShapeTreeInfo::SetController ( const Reference<frame::XController>& rxController) { @@ -118,34 +98,18 @@ void AccessibleShapeTreeInfo::SetController ( } - - - - - - void AccessibleShapeTreeInfo::SetWindow (vcl::Window* pWindow) { mpWindow = pWindow; } - - - - - - void AccessibleShapeTreeInfo::SetViewForwarder (const IAccessibleViewForwarder* pViewForwarder) { mpViewForwarder = pViewForwarder; } - - - - } // end of namespace accessibility /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx index 3f683bce1310..72bc10adc988 100644 --- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx +++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx @@ -88,7 +88,6 @@ OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (Runt } - Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames { "VCLXAccessibleSvxFindReplaceDialog" }; diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index 05ace5f490f3..4adc293c1b9f 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx @@ -37,7 +37,6 @@ namespace accessibility // EventQueue implementation - AccessibleTextEventQueue::AccessibleTextEventQueue() { } @@ -89,5 +88,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 03570b0fdf38..a5eec150f638 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -18,12 +18,9 @@ */ - - // Global header - #include <limits.h> #include <memory> #include <utility> @@ -50,7 +47,6 @@ #include <sfx2/viewsh.hxx> - // Project-local header @@ -1641,7 +1637,6 @@ namespace accessibility } - // AccessibleTextHelper implementation (simply forwards to impl) AccessibleTextHelper::AccessibleTextHelper( ::std::unique_ptr< SvxEditSource > && pEditSource ) : @@ -1902,5 +1897,4 @@ namespace accessibility } // end of namespace accessibility - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index be9dae16dc8a..1caeea682580 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -44,8 +44,6 @@ ChildrenManager::ChildrenManager ( } - - ChildrenManager::~ChildrenManager() { if (mpImpl != nullptr) diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 7c1e4491b75d..62925b936ea7 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -71,8 +71,6 @@ ChildrenManagerImpl::ChildrenManagerImpl ( } - - ChildrenManagerImpl::~ChildrenManagerImpl() { DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose, @@ -80,8 +78,6 @@ ChildrenManagerImpl::~ChildrenManagerImpl() } - - void ChildrenManagerImpl::Init() { // Register as view::XSelectionChangeListener. @@ -104,8 +100,6 @@ void ChildrenManagerImpl::Init() } - - long ChildrenManagerImpl::GetChildCount() const throw () { return maVisibleChildren.size(); @@ -144,8 +138,6 @@ uno::Reference<XAccessible> } - - /** Return the requested accessible child object. Create it if it is not yet in the cache. */ @@ -186,8 +178,6 @@ uno::Reference<XAccessible> } - - uno::Reference<XAccessible> ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape) throw (uno::RuntimeException) @@ -202,8 +192,6 @@ uno::Reference<XAccessible> } - - /** Find all shapes among the specified shapes that lie fully or partially inside the visible area. Put those shapes into the cleared cache. The corresponding accessible objects will be created on demand. @@ -349,8 +337,6 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes ( } - - void ChildrenManagerImpl::RemoveNonVisibleChildren ( const ChildDescriptorListType& rNewChildList, ChildDescriptorListType& rOldChildList) @@ -383,8 +369,6 @@ void ChildrenManagerImpl::RemoveNonVisibleChildren ( } - - void ChildrenManagerImpl::MergeAccessibilityInformation ( ChildDescriptorListType& raNewChildList) { @@ -409,8 +393,6 @@ void ChildrenManagerImpl::MergeAccessibilityInformation ( } - - void ChildrenManagerImpl::SendVisibleAreaEvents ( ChildDescriptorListType& raNewChildList) { @@ -429,8 +411,6 @@ void ChildrenManagerImpl::SendVisibleAreaEvents ( } - - void ChildrenManagerImpl::CreateAccessibilityObjects ( ChildDescriptorListType& raNewChildList) { @@ -454,8 +434,6 @@ void ChildrenManagerImpl::CreateAccessibilityObjects ( } - - void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape) { if (rxShape.is()) @@ -504,8 +482,6 @@ void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape) } - - void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape) { if (rxShape.is()) @@ -535,16 +511,12 @@ void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape } - - void ChildrenManagerImpl::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList) { mxShapeList = xShapeList; } - - void ChildrenManagerImpl::AddAccessibleShape (css::uno::Reference<css::accessibility::XAccessible> const & shape) { assert(shape.is()); @@ -552,8 +524,6 @@ void ChildrenManagerImpl::AddAccessibleShape (css::uno::Reference<css::accessibi } - - void ChildrenManagerImpl::ClearAccessibleShapeList() { // Copy the list of (visible) shapes to local lists and clear the @@ -598,8 +568,6 @@ void ChildrenManagerImpl::ClearAccessibleShapeList() } - - /** If the broadcasters change at which this object is registered then unregister at old and register at new broadcasters. */ @@ -716,8 +684,6 @@ void SAL_CALL } - - void ChildrenManagerImpl::impl_dispose() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); @@ -762,7 +728,6 @@ void ChildrenManagerImpl::impl_dispose() } - void SAL_CALL ChildrenManagerImpl::disposing() { impl_dispose(); @@ -1044,16 +1009,12 @@ void ChildrenManagerImpl::UpdateSelection() } - - bool ChildrenManagerImpl::HasFocus() { return mpFocusedShape != nullptr; } - - void ChildrenManagerImpl::RemoveFocus() { if (mpFocusedShape != nullptr) @@ -1064,7 +1025,6 @@ void ChildrenManagerImpl::RemoveFocus() } - void ChildrenManagerImpl::RegisterAsDisposeListener ( const Reference<drawing::XShape>& xShape) { @@ -1075,8 +1035,6 @@ void ChildrenManagerImpl::RegisterAsDisposeListener ( } - - void ChildrenManagerImpl::UnregisterAsDisposeListener ( const Reference<drawing::XShape>& xShape) { @@ -1096,8 +1054,6 @@ ChildDescriptor::ChildDescriptor (const Reference<drawing::XShape>& xShape) } - - ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShape) : mxShape (nullptr), mxAccessibleShape (rxAccessibleShape), @@ -1110,15 +1066,11 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap } - - ChildDescriptor::~ChildDescriptor() { } - - AccessibleShape* ChildDescriptor::GetAccessibleShape() const { return static_cast<AccessibleShape*> (mxAccessibleShape.get()); @@ -1132,9 +1084,6 @@ void ChildDescriptor::setIndexAtAccessibleShape(sal_Int32 _nIndex) } - - - void ChildDescriptor::disposeAccessibleObject (AccessibleContextBase& rParent) { if (mxAccessibleShape.is()) diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index c6a94c65bfe8..1222d99ac784 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -436,8 +436,6 @@ private: }; - - /** A child descriptor holds a reference to a UNO shape and the corresponding accessible object. There are two use cases: <ol><li>The accessible object is only created on demand and is then @@ -531,7 +529,6 @@ public: }; - } // end of namespace accessibility #endif diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 9b2ad6bc067c..518a7961ea09 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -62,15 +62,11 @@ DescriptionGenerator::DescriptionGenerator ( } - - DescriptionGenerator::~DescriptionGenerator() { } - - void DescriptionGenerator::Initialize (sal_Int32 nResourceId) { // Get the string from the resource for the specified id. @@ -85,8 +81,6 @@ void DescriptionGenerator::Initialize (sal_Int32 nResourceId) } - - void DescriptionGenerator::Initialize (const OUString& sPrefix) { msDescription = sPrefix; @@ -123,8 +117,6 @@ void DescriptionGenerator::Initialize (const OUString& sPrefix) } - - OUString DescriptionGenerator::operator() (void) { msDescription.append('.'); @@ -132,8 +124,6 @@ OUString DescriptionGenerator::operator() (void) } - - void DescriptionGenerator::AddProperty ( const OUString& sPropertyName, PropertyType aType, @@ -149,8 +139,6 @@ void DescriptionGenerator::AddProperty ( } - - void DescriptionGenerator::AddProperty (const OUString& sPropertyName, PropertyType aType, const OUString& sLocalizedName, long nWhichId) { @@ -192,16 +180,12 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, } - - void DescriptionGenerator::AppendString (const OUString& sString) { msDescription.append (sString); } - - void DescriptionGenerator::AddLineProperties() { AddProperty ("LineColor", DescriptionGenerator::COLOR, SIP_XA_LINECOLOR); @@ -211,8 +195,6 @@ void DescriptionGenerator::AddLineProperties() } - - /** The fill style is described by the property "FillStyle". Depending on its value a hatch-, gradient-, or bitmap name is appended. */ @@ -222,8 +204,6 @@ void DescriptionGenerator::AddFillProperties() } - - void DescriptionGenerator::Add3DProperties() { AddProperty ("D3DMaterialColor", DescriptionGenerator::COLOR, @@ -233,8 +213,6 @@ void DescriptionGenerator::Add3DProperties() } - - void DescriptionGenerator::AddTextProperties() { AddProperty ("CharColor", DescriptionGenerator::COLOR); @@ -242,8 +220,6 @@ void DescriptionGenerator::AddTextProperties() } - - /** Search for the given color in the global color table. If found append its name to the description. Otherwise append its RGB tuple. */ @@ -272,8 +248,6 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName, } - - void DescriptionGenerator::AddInteger (const OUString& sPropertyName, const OUString& sLocalizedName) { @@ -297,8 +271,6 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName, } - - void DescriptionGenerator::AddString (const OUString& sPropertyName, const OUString& sLocalizedName, long nWhichId) { @@ -332,8 +304,6 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName, } - - void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, const OUString& sLocalizedName) { diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 0aa17dbce2df..2e4462dc9137 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -120,7 +120,6 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext( } - /** on destruction, this component is disposed and all dispose listeners are called, except if this component was already disposed */ SvxGraphCtrlAccessibleContext::~SvxGraphCtrlAccessibleContext() @@ -129,7 +128,6 @@ SvxGraphCtrlAccessibleContext::~SvxGraphCtrlAccessibleContext() } - /** returns the XAccessible interface for a given SdrObject. Multiple calls for the same SdrObject return the same XAccessible. */ @@ -189,7 +187,6 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -220,7 +217,6 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt } - awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() @@ -234,7 +230,6 @@ awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( Runtim } - awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() @@ -243,7 +238,6 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeE } - awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBoxOnScreen() @@ -252,7 +246,6 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( } - awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException, std::exception ) { // no guard -> done in GetBoundingBox() @@ -272,7 +265,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() thro } - /** returns the SdrObject at index nIndex from the model of this graph */ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) throw( RuntimeException, lang::IndexOutOfBoundsException ) @@ -289,7 +281,6 @@ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) } - /** sends an AccessibleEventObject to all added XAccessibleEventListeners */ void SvxGraphCtrlAccessibleContext::CommitChange ( sal_Int16 nEventId, @@ -313,7 +304,6 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) throw( RuntimeException, lang::IndexOutOfBoundsException, std::exception ) { @@ -323,14 +313,12 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } - sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -362,14 +350,12 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() t } - sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } - OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -377,7 +363,6 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() thro } - OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -385,7 +370,6 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( Runt } - /** Return empty reference to indicate that the relation set is not supported. */ @@ -395,7 +379,6 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getA } - Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -420,7 +403,6 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce } - lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -450,7 +432,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const R } - void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception ) { @@ -545,7 +526,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI } - sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -557,7 +537,6 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_ } - void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -569,7 +548,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R } - void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -581,7 +559,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw } - sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -594,7 +571,6 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun } - Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { @@ -613,7 +589,6 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce } - void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -650,7 +625,6 @@ void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( long nIndex ) th } - /** Replace the model, page, and view pointers by the ones provided (explicitly and implicitly). */ @@ -680,9 +654,6 @@ void SvxGraphCtrlAccessibleContext::setModelAndView ( } - - - void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() { ::SolarMutexGuard aGuard; @@ -719,7 +690,6 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() } - Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -734,7 +704,6 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( Runtime } - /** Calculate the relative coordinates of the bounding box as difference between the absolute coordinates of the bounding boxes of this control and its parent in the accessibility tree. @@ -825,7 +794,6 @@ Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const } - Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const { if( mpControl ) @@ -840,7 +808,6 @@ Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const } - Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const { if( mpControl ) @@ -850,5 +817,4 @@ Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index c6e27664044d..ffc149f59e71 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -52,8 +52,6 @@ AccessibleShape* } - - ShapeTypeHandler& ShapeTypeHandler::Instance() { // Using double check pattern to make sure that exactly one instance of @@ -75,8 +73,6 @@ ShapeTypeHandler& ShapeTypeHandler::Instance() } - - /** The given service name is first transformed into a slot id that identifies the place of the type descriptor. From that descriptor the shape type id is returned. @@ -93,7 +89,6 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const OUString& aServiceName) const } - /** Extract the specified shape's service name and forward the request to the appropriate method. */ @@ -107,8 +102,6 @@ ShapeTypeId ShapeTypeHandler::GetTypeId (const uno::Reference<drawing::XShape>& } - - /** This factory method determines the type descriptor for the type of the given shape, then calls the descriptor's create function, and finally initializes the new object. @@ -128,8 +121,6 @@ rtl::Reference<AccessibleShape> } - - /** Create the single instance of this class and initialize its list of type descriptors with an entry of an unknown type. */ @@ -145,8 +136,6 @@ ShapeTypeHandler::ShapeTypeHandler() } - - ShapeTypeHandler::~ShapeTypeHandler() { // Because this class is a singleton and the only instance, whose @@ -191,8 +180,6 @@ bool ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount, } - - long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const { tServiceNameToSlotId::iterator I (maServiceNameToSlotId.find (aServiceName)); @@ -203,8 +190,6 @@ long ShapeTypeHandler::GetSlotId (const OUString& aServiceName) const } - - // Extract the given shape's service name and forward request to appropriate // method. long ShapeTypeHandler::GetSlotId (const uno::Reference<drawing::XShape>& rxShape) const diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 9be840d2f054..3e5ec9e0f34d 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -54,7 +54,6 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : } - SvxShowCharSetVirtualAcc::~SvxShowCharSetVirtualAcc() { ensureDisposed(); @@ -247,7 +246,6 @@ SvxShowCharSetItem::~SvxShowCharSetItem() } - uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessible() { if( !m_xAcc.is() ) @@ -260,7 +258,6 @@ uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessi } - void SvxShowCharSetItem::ClearAccessible() { if ( m_xAcc.is() ) @@ -286,7 +283,6 @@ SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAc } - SvxShowCharSetAcc::~SvxShowCharSetAcc() { ensureDisposed(); @@ -357,7 +353,6 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -379,7 +374,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -389,7 +383,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge } - sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -397,7 +390,6 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole() } - OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -406,7 +398,6 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription() } - OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -416,7 +407,6 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName() } - uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -424,7 +414,6 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha } - uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -618,7 +607,6 @@ SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OA } - SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc() { ensureDisposed(); @@ -636,7 +624,6 @@ void SvxShowCharSetItemAcc::ParentDestroyed() } - sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { @@ -644,7 +631,6 @@ sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -652,7 +638,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc } - uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleParent() throw (uno::RuntimeException, std::exception) { @@ -662,7 +647,6 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc } - sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() throw (uno::RuntimeException, std::exception) { @@ -670,7 +654,6 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole() } - OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { @@ -698,7 +681,6 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription() } - OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() throw (uno::RuntimeException, std::exception) { @@ -718,7 +700,6 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() } - uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { @@ -726,7 +707,6 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha } - uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { @@ -763,14 +743,12 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe } - sal_Int32 SvxShowCharSetItemAcc::getAccessibleActionCount() throw (RuntimeException, std::exception) { return 1; } - sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -784,7 +762,6 @@ sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex ) throw (I } - OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( nIndex == 0 ) @@ -793,7 +770,6 @@ OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nInde } - Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { if( nIndex == 0 ) @@ -802,7 +778,6 @@ Reference< css::accessibility::XAccessibleKeyBinding > SvxShowCharSetItemAcc::ge } - void SAL_CALL SvxShowCharSetItemAcc::grabFocus() throw (uno::RuntimeException, std::exception) { @@ -894,9 +869,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException, } - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index b25774e763c4..69288d85e542 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -708,10 +708,6 @@ void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::Dispos } - - - - SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( const Reference<XAccessible>& rxParent, const vcl::Window& rParentWindow, @@ -916,8 +912,6 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::addAccessibleEventListener( cons } - - void SAL_CALL SvxRectCtlChildAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw( RuntimeException, std::exception ) { @@ -979,7 +973,6 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (R } - sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -995,7 +988,6 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex } - OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1007,7 +999,6 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_ } - Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 5360a9ea067a..672d04bcd9bf 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -88,7 +88,6 @@ namespace { - // EXPRESSION NODES @@ -761,11 +760,9 @@ public: }; - // FUNCTION PARSER - typedef const sal_Char* StringIteratorT; struct ParserContext @@ -1160,7 +1157,6 @@ const ParserContextSharedPtr& getParserContext() namespace EnhancedCustomShape { - ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index d3e66f06d8ce..230f489f8062 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -22,7 +22,6 @@ #include "svx/unoapi.hxx" - EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ) : mnIndex ( nIndex ), mxCustomShape ( xCustomShape ) @@ -30,20 +29,17 @@ EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css:: } - EnhancedCustomShapeHandle::~EnhancedCustomShapeHandle() { } - void SAL_CALL EnhancedCustomShapeHandle::acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL EnhancedCustomShapeHandle::release() throw() { OWeakObject::release(); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 5433cbd035df..a2455646741a 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -38,7 +38,6 @@ #define OWN_CALLMODE SfxCallMode::ASYNCHRON | SfxCallMode::RECORD - #define TEST_COLS() \ { \ nR = aCol.GetRed(); nG = aCol.GetGreen(); nB = aCol.GetBlue(); \ @@ -156,7 +155,6 @@ void MaskSet::onEditColor() } - class MaskData { VclPtr<SvxBmpMask> pMask; @@ -179,7 +177,6 @@ public: }; - MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : pMask ( pBmpMask ), @@ -232,7 +229,6 @@ IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) } - IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) { CheckBox* pCbx = static_cast<CheckBox*>(pButton); @@ -294,7 +290,6 @@ IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) } - IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) { ColorLB* pLb = static_cast<ColorLB*>(&rControl); @@ -306,7 +301,6 @@ IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) } - IMPL_LINK_NOARG_TYPED(MaskData, ExecHdl, Button*, void) { SfxBoolItem aBItem( SID_BMPMASK_EXEC, true ); @@ -605,7 +599,6 @@ void SvxBmpMask::SetExecState( bool bEnable ) } - sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols ) { sal_uInt16 nCount = 0; @@ -642,7 +635,6 @@ sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uI } - Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) { Bitmap aBitmap( rBitmap ); @@ -659,7 +651,6 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) } - BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& rColor, const long nTol ) { EnterWait(); @@ -677,7 +668,6 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& } - Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) { Animation aAnimation( rAnimation ); @@ -698,7 +688,6 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) } - GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) { GDIMetaFile aMtf; @@ -955,7 +944,6 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } - BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color& rColor ) { if( rBmpEx.IsTransparent() ) @@ -969,7 +957,6 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color } - Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor ) { Animation aAnimation( rAnim ); @@ -986,7 +973,6 @@ Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Colo } - GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const Color& rColor ) { ScopedVclPtrInstance< VirtualDevice > pVDev; @@ -1020,7 +1006,6 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C } - Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { Graphic aGraphic( rGraphic ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 5c34df44a31a..2a7599902956 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -100,7 +100,6 @@ void SvxShowCharSet::GetFocus() } - void SvxShowCharSet::LoseFocus() { Control::LoseFocus(); @@ -108,7 +107,6 @@ void SvxShowCharSet::LoseFocus() } - void SvxShowCharSet::StateChanged(StateChangedType nType) { if (nType == StateChangedType::ControlForeground) @@ -123,7 +121,6 @@ void SvxShowCharSet::StateChanged(StateChangedType nType) } - void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) { if ((rDCEvt.GetType() == DataChangedEventType::SETTINGS) @@ -139,7 +136,6 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) } - void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) @@ -161,7 +157,6 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) } - void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) { if ( bDrag && rMEvt.IsLeft() ) @@ -175,7 +170,6 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) } - void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() && bDrag ) @@ -199,7 +193,6 @@ void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) } - void SvxShowCharSet::Command( const CommandEvent& rCEvt ) { if( !HandleScrollCommand( rCEvt, nullptr, aVscrollSB.get() ) ) @@ -207,21 +200,18 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt ) } - sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) { return _nPos / COLUMN_COUNT ; } - sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) { return _nPos % COLUMN_COUNT ; } - int SvxShowCharSet::FirstInView() const { int nIndex = 0; @@ -231,7 +221,6 @@ int SvxShowCharSet::FirstInView() const } - int SvxShowCharSet::LastInView() const { sal_uIntPtr nIndex = FirstInView(); @@ -243,7 +232,6 @@ int SvxShowCharSet::LastInView() const } - inline Point SvxShowCharSet::MapIndexToPixel( int nIndex ) const { const int nBase = FirstInView(); @@ -260,7 +248,6 @@ int SvxShowCharSet::PixelToMapIndex( const Point& point) const } - void SvxShowCharSet::KeyInput(const KeyEvent& rKEvt) { vcl::KeyCode aCode = rKEvt.GetKeyCode(); @@ -329,7 +316,6 @@ void SvxShowCharSet::KeyInput(const KeyEvent& rKEvt) } - void SvxShowCharSet::Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) { InitSettings(rRenderContext); @@ -495,7 +481,6 @@ void SvxShowCharSet::DrawChars_Impl(vcl::RenderContext& rRenderContext, int n1, } - void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext) { const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); @@ -530,7 +515,6 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& rRenderContext) } - sal_UCS4 SvxShowCharSet::GetSelectCharacter() const { if( nSelectedIndex >= 0 ) @@ -539,7 +523,6 @@ sal_UCS4 SvxShowCharSet::GetSelectCharacter() const } - void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext) { if (!mbRecalculateFont) @@ -588,7 +571,6 @@ void SvxShowCharSet::RecalculateFont(vcl::RenderContext& rRenderContext) } - void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) { if( !aVscrollSB ) @@ -662,7 +644,6 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) } - void SvxShowCharSet::OutputIndex( int nNewIndex ) { SelectIndex( nNewIndex, true ); @@ -671,7 +652,6 @@ void SvxShowCharSet::OutputIndex( int nNewIndex ) } - void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) { if (mpFontCharMap == nullptr) @@ -691,7 +671,6 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) } - IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) { if( nSelectedIndex < FirstInView() ) @@ -717,7 +696,6 @@ IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) } - SvxShowCharSet::~SvxShowCharSet() { disposeOnce(); @@ -766,7 +744,6 @@ svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos ) } - sal_Int32 SvxShowCharSet::getMaxCharCount() const { return mpFontCharMap->GetCharCount(); diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 0faa72feb39e..ae321b006820 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -71,7 +71,6 @@ void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uLong nPos, } - void SvxCheckListBox::RemoveEntry( sal_uLong nPos ) { if ( nPos < GetEntryCount() ) @@ -79,7 +78,6 @@ void SvxCheckListBox::RemoveEntry( sal_uLong nPos ) } - void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) { if ( nPos < GetEntryCount() ) @@ -87,7 +85,6 @@ void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) } - sal_uLong SvxCheckListBox::GetSelectEntryPos() const { SvTreeListEntry* pEntry = GetCurEntry(); @@ -98,7 +95,6 @@ sal_uLong SvxCheckListBox::GetSelectEntryPos() const } - OUString SvxCheckListBox::GetText( sal_uLong nPos ) const { SvTreeListEntry* pEntry = GetEntry( nPos ); @@ -109,7 +105,6 @@ OUString SvxCheckListBox::GetText( sal_uLong nPos ) const } - sal_uLong SvxCheckListBox::GetCheckedEntryCount() const { sal_uLong nCheckCount = 0; @@ -124,7 +119,6 @@ sal_uLong SvxCheckListBox::GetCheckedEntryCount() const } - void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, bool bCheck ) { if ( nPos < GetEntryCount() ) @@ -134,7 +128,6 @@ void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, bool bCheck ) } - bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const { if ( nPos < GetEntryCount() ) @@ -144,7 +137,6 @@ bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const } - void* SvxCheckListBox::SetEntryData ( sal_uLong nPos, void* pNewData ) { void* pOld = nullptr; @@ -158,7 +150,6 @@ void* SvxCheckListBox::SetEntryData ( sal_uLong nPos, void* pNewData ) } - void* SvxCheckListBox::GetEntryData( sal_uLong nPos ) const { if ( nPos < GetEntryCount() ) @@ -168,7 +159,6 @@ void* SvxCheckListBox::GetEntryData( sal_uLong nPos ) const } - void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) { if ( pEntry ) @@ -181,7 +171,6 @@ void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) } - void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() ) @@ -221,7 +210,6 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) } - void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) { const vcl::KeyCode& rKey = rKEvt.GetKeyCode(); @@ -243,7 +231,6 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) } - SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { return SvTreeListBox::InsertEntry( rText, pParent, bChildrenOnDemand, nPos, pUserData, eButtonKind ); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 77f62b1b4fc4..8a01d28fb9a2 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -218,7 +218,6 @@ void DialControlBmp::DrawBackground() } - DialControl::DialControl_Impl::DialControl_Impl ( vcl::Window& rParent ) : mxBmpEnabled(VclPtr<DialControlBmp>::Create(rParent)), mxBmpDisabled(VclPtr<DialControlBmp>::Create(rParent)), @@ -259,7 +258,6 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) } - DialControl::DialControl( vcl::Window* pParent, WinBits nBits ) : Control( pParent, nBits ), mpImpl( new DialControl_Impl( *this ) ) @@ -437,8 +435,6 @@ void DialControl::LinkedFieldModifyHdl() } - - void DialControl::SaveValue() { mpImpl->mnInitialAngle = mpImpl->mnAngle; @@ -559,7 +555,6 @@ void DialControlWrapper::SetControlValue( sal_Int32 nValue ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 2dbd53e6f72b..8de7620f004f 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -243,7 +243,6 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr ) } - #define RADIUS_LAMP_PREVIEW_SIZE (4500.0) #define RADIUS_LAMP_SMALL (600.0) #define RADIUS_LAMP_BIG (1000.0) diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 330925d4938c..f97ad97c71c2 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -27,7 +27,6 @@ #include <sfx2/objsh.hxx> - FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { FieldUnit eUnit = FUNIT_INCH; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 8511dc0190c9..c781d07440c4 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -425,7 +425,6 @@ void FontPrevWin_Impl::DrawPrev(vcl::RenderContext& rRenderContext, Printer* _pP } - bool FontPrevWin_Impl::SetFontWidthScale(sal_uInt16 nScale) { if (mnFontWidthScale != nScale) diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 12c5c2fd81d1..30a521a5afeb 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -77,8 +77,6 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt } - - SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , maStdFont(GetFont()) @@ -149,5 +147,4 @@ void SvxFontListBox::InitEntry( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index fd85200dbca5..d8f0a189c014 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -43,7 +43,6 @@ namespace svx { namespace frame { - namespace { typedef std::vector< Point > PointVec; @@ -171,7 +170,6 @@ struct DiagBordersResult }; - /** A helper struct containing two points of a line. */ struct LinePoints @@ -187,7 +185,6 @@ struct LinePoints }; - /** Rounds and casts a double value to a long value. */ inline long lclD2L( double fValue ) { @@ -344,7 +341,6 @@ inline long lclGetBehindEnd( const Style& rBorder ) // Linking functions - // Linking of single horizontal line ends. /** Calculates X offsets for the left end of a single horizontal frame border. @@ -612,8 +608,6 @@ void lclLinkVerFrameBorder( } - - // Linking of diagonal frame borders. /** Calculates clipping offsets for a top-left to bottom-right frame border. @@ -697,7 +691,6 @@ void lclLinkDiagFrameBorders( // Drawing functions - // Simple helper functions /** Converts sub units to OutputDevice map units. */ @@ -752,7 +745,6 @@ void lclSetColorToOutDev( OutputDevice& rDev, const Color& rColor, const Color* } - // Drawing of horizontal frame borders. /** Draws a horizontal thin or thick line into the passed output device. @@ -1119,7 +1111,6 @@ void lclDrawDiagFrameBorders( } - } // namespace @@ -1311,7 +1302,6 @@ double GetHorDiagAngle( long nWidth, long nHeight ) } - long GetTLDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ) { return lclD2L( nVerOffs / tan( fAngle ) + nDiagOffs / sin( fAngle ) ); @@ -1333,7 +1323,6 @@ long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle ) } - bool CheckFrameBorderConnectable( const Style& rLBorder, const Style& rRBorder, const Style& rTFromTL, const Style& rTFromT, const Style& rTFromTR, const Style& rBFromBL, const Style& rBFromB, const Style& rBFromBR ) @@ -1489,7 +1478,6 @@ void DrawHorFrameBorder( OutputDevice& rDev, } - void DrawVerFrameBorder( OutputDevice& rDev, const Point& rTPos, const Point& rBPos, const Style& rBorder, const DiagStyle& rTFromBL, const Style& rTFromL, const Style& rTFromT, const Style& rTFromR, const DiagStyle& rTFromBR, @@ -1507,7 +1495,6 @@ void DrawVerFrameBorder( OutputDevice& rDev, } - void DrawDiagFrameBorders( OutputDevice& rDev, const Rectangle& rRect, const Style& rTLBR, const Style& rBLTR, const Style& rTLFromB, const Style& rTLFromR, const Style& rBRFromT, const Style& rBRFromL, @@ -1524,7 +1511,6 @@ void DrawDiagFrameBorders( } - } } diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 615970dbcfc5..548ba97c5df9 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -85,8 +85,6 @@ void Cell::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag ) } - - void lclRecalcCoordVec( LongVec& rCoords, const LongVec& rSizes ) { DBG_ASSERT( rCoords.size() == rSizes.size() + 1, "lclRecalcCoordVec - inconsistent vectors" ); @@ -112,7 +110,6 @@ void lclSetMergedRange( CellVec& rCells, size_t nWidth, size_t nFirstCol, size_t } - static const Style OBJ_STYLE_NONE; static const Cell OBJ_CELL_NONE; @@ -333,7 +330,6 @@ double ArrayImpl::GetVerDiagAngle( size_t nCol, size_t nRow, bool bSimple ) cons } - class MergedCellIterator { public: @@ -355,7 +351,6 @@ private: }; - MergedCellIterator::MergedCellIterator( const Array& rArray, size_t nCol, size_t nRow ) { DBG_ASSERT( rArray.IsMerged( nCol, nRow ), "svx::frame::MergedCellIterator::MergedCellIterator - not in merged range" ); @@ -376,7 +371,6 @@ MergedCellIterator& MergedCellIterator::operator++() } - #define DBG_FRAME_CHECK( cond, funcname, error ) DBG_ASSERT( cond, "svx::frame::Array::" funcname " - " error ) #define DBG_FRAME_CHECK_COL( col, funcname ) DBG_FRAME_CHECK( (col) < GetColCount(), funcname, "invalid column index" ) #define DBG_FRAME_CHECK_ROW( row, funcname ) DBG_FRAME_CHECK( (row) < GetRowCount(), funcname, "invalid row index" ) @@ -385,13 +379,11 @@ MergedCellIterator& MergedCellIterator::operator++() #define DBG_FRAME_CHECK_ROW_1( row, funcname ) DBG_FRAME_CHECK( (row) <= GetRowCount(), funcname, "invalid row index" ) - #define CELL( col, row ) mxImpl->GetCell( col, row ) #define CELLACC( col, row ) mxImpl->GetCellAcc( col, row ) #define ORIGCELL( col, row ) mxImpl->GetMergedOriginCell( col, row ) - Array::Array() { Initialize( 0, 0 ); @@ -1327,13 +1319,11 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const } - #undef ORIGCELL #undef CELLACC #undef CELL - #undef DBG_FRAME_CHECK_ROW_1 #undef DBG_FRAME_CHECK_COL_1 #undef DBG_FRAME_CHECK_COLROW @@ -1342,7 +1332,6 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const #undef DBG_FRAME_CHECK - } } diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index bc2239f70942..49093a93d391 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -81,7 +81,6 @@ SvxFrameDirection FrameDirectionListBox::GetSelectEntryValue() const } - FrameDirListBoxWrapper::FrameDirListBoxWrapper( FrameDirListBox& rListBox ) : SingleControlWrapperType( rListBox ) { @@ -109,7 +108,6 @@ void FrameDirListBoxWrapper::SetControlValue( SvxFrameDirection eValue ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 0c7583f8bf61..7a67870b548e 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1247,7 +1247,6 @@ Size FrameSelector::GetOptimalSize() const } - template< typename Cont, typename Iter, typename Pred > FrameBorderIterBase< Cont, Iter, Pred >::FrameBorderIterBase( container_type& rCont ) : maIt( rCont.begin() ), @@ -1264,7 +1263,6 @@ FrameBorderIterBase< Cont, Iter, Pred >& FrameBorderIterBase< Cont, Iter, Pred > } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 25e82dea2b97..f609fec3a405 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -276,7 +276,6 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj } - void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet ) { if( SfxItemState::DEFAULT <= rSet.GetItemState( SID_GRFFILTER ) ) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 7af5341e2ebb..08585b9f3760 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -121,14 +121,12 @@ VclPtr<SfxTabPage> SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet } - VclPtr<SfxTabPage> SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return VclPtr<SvxFooterPage>::Create( pParent, *rSet ); } - SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) @@ -137,7 +135,6 @@ SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : } - SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) @@ -200,7 +197,6 @@ SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 n } - SvxHFPage::~SvxHFPage() { disposeOnce(); @@ -229,7 +225,6 @@ void SvxHFPage::dispose() } - bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) { const sal_uInt16 nWSize = GetWhich(SID_ATTR_PAGE_SIZE); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 533c9f82a377..8e4e190416a4 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -758,8 +758,6 @@ IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void ) } - - sal_Int32 SvxLanguageComboBox::SaveEditedAsEntry() { if (meEditedAndValid != EDITED_VALID) diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index fb10253e2461..848949e8e9d1 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -206,7 +206,6 @@ VclPtr<SfxTabPage> SvxGridTabPage::Create( vcl::Window* pParent, const SfxItemSe } - bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) @@ -233,7 +232,6 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) } - void SvxGridTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pAttr = nullptr; @@ -260,7 +258,6 @@ void SvxGridTabPage::Reset( const SfxItemSet* rSet ) } - void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = nullptr; @@ -334,7 +331,6 @@ IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) { bAttrModified = true; diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 1bae8481e15e..3c40a1589d47 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -28,7 +28,6 @@ namespace svx { - struct OrientationHelper_Impl { typedef std::pair< VclPtr<vcl::Window>, TriState > WindowPair; @@ -53,7 +52,6 @@ struct OrientationHelper_Impl }; - OrientationHelper_Impl::OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox& rCbStacked ) : mrCtrlDial( rCtrlDial ), mrCbStacked( rCbStacked ), @@ -103,7 +101,6 @@ IMPL_LINK_NOARG_TYPED(OrientationHelper_Impl, ClickHdl, Button*, void) } - OrientationHelper::OrientationHelper( DialControl& rCtrlDial, NumericField& rNfRotation, CheckBox& rCbStacked ) : mpImpl( new OrientationHelper_Impl( rCtrlDial, rCbStacked ) ) { @@ -153,7 +150,6 @@ void OrientationHelper::EnableStackedTriState( bool bEnable ) } - OrientStackedWrapper::OrientStackedWrapper( OrientationHelper& rOrientHlp ) : SingleControlWrapperType( rOrientHlp ) { @@ -181,7 +177,6 @@ void OrientStackedWrapper::SetControlValue( bool bValue ) } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 65a31f216f5d..b5a6b16769ab 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -402,7 +402,6 @@ void SvxPageWindow::drawFillAttributes(vcl::RenderContext& rRenderContext, } - void SvxPageWindow::SetBorder(const SvxBoxItem& rNew) { delete pBorder; @@ -410,7 +409,6 @@ void SvxPageWindow::SetBorder(const SvxBoxItem& rNew) } - void SvxPageWindow::SetHdBorder(const SvxBoxItem& rNew) { delete pHdBorder; diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 8455f7fcdb92..6a1430dcabae 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -50,7 +50,6 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, EditModifyHdl, Edit&, void) { if ( !bEmpty ) @@ -66,7 +65,6 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, EditModifyHdl, Edit&, void) } - SvxPasswordDialog::SvxPasswordDialog(vcl::Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui") , aOldPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_OLD_PASSWD)) diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 96267d955761..59cd731a80f5 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -85,7 +85,6 @@ void SvxRelativeField::Modify() } - void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep ) { @@ -97,7 +96,6 @@ void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, } - void SvxRelativeField::SetRelative( bool bNewRelative ) { Selection aSelection = GetSelection(); diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 35b0435209f2..06ad0da4a9db 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -20,10 +20,6 @@ #include <svl/rectitem.hxx> - - - - #include <svx/dialogs.hrc> #include <svx/ruler.hxx> @@ -42,7 +38,6 @@ SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindin } - void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 9fbdcf49c73d..c5f8987dce60 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -149,7 +149,6 @@ SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy) : {} - void SvxLongLRSpaceItem::SetLeft(long lArgLeft) { mlLeft = lArgLeft; @@ -276,7 +275,6 @@ SvxLongULSpaceItem::SvxLongULSpaceItem() : {} - void SvxLongULSpaceItem::SetUpper(long lArgLeft) { mlLeft = lArgLeft; @@ -784,10 +782,6 @@ bool SvxObjectItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) } - - - - void SvxObjectItem::SetStartX(long lValue) { nStartX = lValue; diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 3bc463b0f30d..421623684396 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -39,7 +39,6 @@ SvxSearchController::SvxSearchController } - void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 5741e29eeeda..20ea8eaec237 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -79,7 +79,6 @@ using namespace com::sun::star; using namespace comphelper; - #define REMEMBER_SIZE 10 #define MODIFY_SEARCH 0x00000001 @@ -166,14 +165,12 @@ SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) : } - SearchAttrItemList::~SearchAttrItemList() { Clear(); } - void SearchAttrItemList::Put( const SfxItemSet& rSet ) { if ( !rSet.Count() ) @@ -209,7 +206,6 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet ) } - SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) { SfxItemPool* pPool = rSet.GetPool(); @@ -223,7 +219,6 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) } - void SearchAttrItemList::Clear() { for ( size_t i = 0; i < size(); ++i ) @@ -233,7 +228,6 @@ void SearchAttrItemList::Clear() } - // Deletes the pointer to the items void SearchAttrItemList::Remove(size_t nPos, size_t nLen) { @@ -343,7 +337,6 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi } - SvxSearchDialog::~SvxSearchDialog() { disposeOnce(); @@ -545,7 +538,6 @@ void SvxSearchDialog::Construct_Impl() } - bool SvxSearchDialog::Close() { // remember strings speichern @@ -577,7 +569,6 @@ bool SvxSearchDialog::Close() } - sal_Int32 SvxSearchDialog::GetTransliterationFlags() const { if (!m_pMatchCaseCB->IsChecked()) @@ -597,7 +588,6 @@ void SvxSearchDialog::SetSaveToModule(bool b) } - void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) { nTransliterationFlags = nSettings; @@ -608,7 +598,6 @@ void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) } - void SvxSearchDialog::Activate() { // apply possible transliteration changes of the SvxSearchItem member @@ -621,7 +610,6 @@ void SvxSearchDialog::Activate() } - void SvxSearchDialog::InitControls_Impl() { // CaseSensitives AutoComplete @@ -747,7 +735,6 @@ void SvxSearchDialog::ShowOptionalControls_Impl() } - namespace { class ToggleSaveToModule @@ -1049,7 +1036,6 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) } - void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, const SfxItemSet* pRSet ) { @@ -1109,7 +1095,6 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, } - IMPL_LINK_TYPED( SvxSearchDialog, LBSelectHdl_Impl, ListBox&, rCtrl, void ) { ClickHdl_Impl(&rCtrl); @@ -1238,7 +1223,6 @@ void SvxSearchDialog::ClickHdl_Impl(void* pCtrl) } - IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) { bool bInclusive = ( m_pLayoutBtn->GetText() == aLayoutStr ); @@ -1402,7 +1386,6 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) } - IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) { if ( !bSet ) @@ -1443,7 +1426,6 @@ IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void) { if ( pImpl->bSaveToModule ) @@ -1530,7 +1512,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void) } - void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) { if ( rStr.isEmpty() ) @@ -1559,7 +1540,6 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) } - void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) { OUString aOldSrch( m_pSearchTmplLB->GetSelectEntry() ); @@ -1599,7 +1579,6 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) } - void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags ) { if ( nFlags == nOptions ) @@ -1715,7 +1694,6 @@ void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags ) } - void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) { if (m_pSearchBtn == pCtrl && ( SearchOptionFlags::SEARCH & nOptions ) ) @@ -1805,7 +1783,6 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) } - void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) { if ( pItem ) @@ -1818,7 +1795,6 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) } - IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) { sal_Int32 nTxtLen = m_pSearchAttrText->GetText().getLength(); @@ -1878,14 +1854,12 @@ IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, LoseFocusHdl_Impl, Control&, void) { SaveToModule_Impl(); } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) { SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -1977,7 +1951,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) { SvtModuleOptions::EFactory eFactory = getModule(rBindings); @@ -2017,7 +1990,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) { if ( !pSearchList || !pImpl->pRanges ) @@ -2034,7 +2006,6 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) } - IMPL_LINK_TYPED( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) { SfxViewShell* pViewShell = SfxViewShell::Current(); @@ -2054,7 +2025,6 @@ IMPL_LINK_TYPED( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) } - OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, bool bSrchFlag ) const { @@ -2123,7 +2093,6 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, } - void SvxSearchDialog::PaintAttrText_Impl() { OUString aDesc; @@ -2145,7 +2114,6 @@ void SvxSearchDialog::PaintAttrText_Impl() } - void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) { if ( m_pSearchLB == pCtrl ) @@ -2183,7 +2151,6 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl ) } - void SvxSearchDialog::SaveToModule_Impl() { if ( !pSearchItem ) @@ -2263,7 +2230,6 @@ css::uno::Reference< css::awt::XWindowPeer > SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG); - SvxSearchDialogWrapper::SvxSearchDialogWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) @@ -2285,8 +2251,6 @@ SvxSearchDialogWrapper::~SvxSearchDialogWrapper () } - - SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 4e540c36edda..6b2b319fade8 100644 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx @@ -22,7 +22,6 @@ #include <svx/strarray.hxx> - SvxStringArray::SvxStringArray( sal_uInt32 nResId ) : ResStringArray( SVX_RES( nResId ) ) @@ -31,21 +30,17 @@ SvxStringArray::SvxStringArray( sal_uInt32 nResId ) : } - SvxStringArray::SvxStringArray( const ResId& rResId ) : ResStringArray( rResId ) { } - - SvxStringArray::~SvxStringArray() { } - const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const { if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 6d6ff38f9dca..b91442bc7b42 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -77,7 +77,6 @@ sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const } - void SvxTextEncodingBox::FillFromTextEncodingTable( bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, sal_uInt32 nButIncludeInfoFlags ) @@ -127,7 +126,6 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( } - void SvxTextEncodingBox::FillFromDbTextEncodingMap( bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, sal_uInt32 nButIncludeInfoFlags ) @@ -187,7 +185,6 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( } - void SvxTextEncodingBox::FillWithMimeAndSelectBest() { FillFromTextEncodingTable( false, 0xffffffff, RTL_TEXTENCODING_INFO_MIME ); @@ -196,7 +193,6 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest() } - void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, const OUString& rEntry, sal_Int32 nPos ) { @@ -205,7 +201,6 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, } - void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_Int32 nPos ) { const OUString& rEntry = m_pEncTable->GetTextString( nEnc ); @@ -216,7 +211,6 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_In } - rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const { sal_Int32 nPos = GetSelectEntryPos(); @@ -228,7 +222,6 @@ rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const } - void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, bool bSelect ) { sal_Int32 nAt = EncodingToPos_Impl( nEnc ); diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 0240d1992ba5..4da766fa9ef6 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -43,7 +43,6 @@ const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc } - rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) const { sal_uInt32 nCount = Count(); diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx index e37e7a17b48d..0db7d98613ba 100644 --- a/svx/source/engine3d/e3dsceneupdater.cxx +++ b/svx/source/engine3d/e3dsceneupdater.cxx @@ -24,7 +24,6 @@ #include <svx/sdr/contact/viewcontactofe3dscene.hxx> - E3DModifySceneSnapRectUpdater::E3DModifySceneSnapRectUpdater(const SdrObject* pObject) : mpScene(nullptr), mpViewInformation3D(nullptr) diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 84f71a4d4105..26f371ea174f 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -46,15 +46,12 @@ sdr::contact::ViewContact* E3dExtrudeObj::CreateObjectSpecificViewContact() } - sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dExtrudeProperties(*this); } - - // Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side // surfaces rectangles from the passed PolyPolygon diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 10c780b61bfe..edaec94b8ab1 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2174,7 +2174,6 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) } - IMPL_LINK_TYPED( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) { @@ -2441,7 +2440,6 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) } - IMPL_LINK_TYPED( Svx3DWin, ClickColorHdl, Button *, pBtn, void) { SvColorDialog aColorDlg( this ); @@ -2594,7 +2592,6 @@ IMPL_LINK_TYPED( Svx3DWin, ModifyHdl, Edit&, rField, void ) } - void Svx3DWin::ClickLight(PushButton& rBtn) { sal_uInt16 nLightSource = GetLightSource( &rBtn ); @@ -2622,7 +2619,6 @@ void Svx3DWin::ClickLight(PushButton& rBtn) } - IMPL_LINK_NOARG_TYPED(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void) { const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight()); diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 935a0906d6ca..ce9915e737bd 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -29,11 +29,9 @@ #include <com/sun/star/uno/Sequence.h> - using namespace com::sun::star; - class ImplPairDephAndObject { private: @@ -57,7 +55,6 @@ public: }; - void getAllHit3DObjectWithRelativePoint( const basegfx::B3DPoint& rFront, const basegfx::B3DPoint& rBack, @@ -96,7 +93,6 @@ void getAllHit3DObjectWithRelativePoint( } - E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInformation3D& o_rViewInformation3D, const E3dCompoundObject& rCandidate) { // Search for root scene (outmost scene) of the 3d object since e.g. in chart, multiple scenes may @@ -158,7 +154,6 @@ E3dScene* fillViewInformation3DForCompoundObject(drawinglayer::geometry::ViewInf } - void getAllHit3DObjectsSortedFrontToBack( const basegfx::B2DPoint& rPoint, const E3dScene& rScene, @@ -235,7 +230,6 @@ void getAllHit3DObjectsSortedFrontToBack( } - bool checkHitSingle3DObject( const basegfx::B2DPoint& rPoint, const E3dCompoundObject& rCandidate) diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index 44deea0546dc..1605ea4cc05e 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -30,7 +30,6 @@ #include <svx/scene3d.hxx> - namespace drawinglayer { namespace processor3d diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx index 93896707b58a..b5d5b4b56d28 100644 --- a/svx/source/engine3d/helperminimaldepth3d.hxx +++ b/svx/source/engine3d/helperminimaldepth3d.hxx @@ -45,7 +45,6 @@ class E3dCompoundObject; double getMinimalDepthInViewCoordinates(const E3dCompoundObject& rObject); - #endif // INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index bc4e87f0970a..186e922e7177 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -44,15 +44,12 @@ sdr::contact::ViewContact* E3dLatheObj::CreateObjectSpecificViewContact() } - sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dLatheProperties(*this); } - - // Constructor from 3D polygon, scale is the conversion factor for the coordinates E3dLatheObj::E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D) diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 9d67c722261b..85018b965e68 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -78,7 +78,6 @@ #include <svx/e3dsceneupdater.hxx> - using namespace com::sun::star; @@ -172,15 +171,12 @@ SdrObject* E3dObjList::RemoveObject(size_t nObjNum) } - sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() { return new sdr::properties::E3dProperties(*this); } - - E3dObject::E3dObject() : maSubList(), maLocalBoundVol(), @@ -773,8 +769,6 @@ sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperti } - - E3dCompoundObject::E3dCompoundObject() : E3dObject(), aMaterialAmbientColor(), diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index df5d6a45bea1..1a39932674bc 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -26,7 +26,6 @@ #include <basegfx/polygon/b3dpolygontools.hxx> - // DrawContact section sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 911aca6e1820..f37e4d4a209c 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -48,7 +48,6 @@ #include <svx/svdmodel.hxx> - class ImpRemap3DDepth { sal_uInt32 mnOrdNum; @@ -181,8 +180,6 @@ sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact() } - - E3dScene::E3dScene() : E3dObject(), aCamera(basegfx::B3DPoint(0.0, 0.0, 4.0), basegfx::B3DPoint()), diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index b7d6cc935245..17a776e91172 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -42,16 +42,12 @@ sdr::contact::ViewContact* E3dSphereObj::CreateObjectSpecificViewContact() } - sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties() { return new sdr::properties::E3dSphereProperties(*this); } - - - // Build Sphere from polygon facets in latitude and longitude E3dSphereObj::E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize) diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index 6345748396a2..a17f4ccb7b82 100644 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/drawing/ShadeMode.hpp> - - using namespace ::com::sun::star; // #i28528# @@ -89,7 +87,6 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal) {} - Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal) {} diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 1044492d5ceb..da83bf92ef30 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -71,7 +71,6 @@ using namespace com::sun::star; #define ITEMVALUE(ItemSet,Id,Cast) (static_cast<const Cast&>((ItemSet).Get(Id))).GetValue() - // Migrate Marking class Impl3DMirrorConstructOverlay diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 265f89498fdb..88f888aaed25 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -677,5 +677,4 @@ namespace svx } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 699d17a378f7..59d0bbcef3bf 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -51,7 +51,6 @@ namespace svx } - SotClipboardFormatId OComponentTransferable::getDescriptorFormatId(bool _bExtractForm) { static SotClipboardFormatId s_nReportFormat = static_cast<SotClipboardFormatId>(-1); @@ -143,5 +142,4 @@ namespace svx } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index b6f99bf42344..48a4f7c31278 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -78,7 +78,6 @@ using ::com::sun::star::sdb::XRowSetSupplier; using ::com::sun::star::awt::XVclWindowPeer; - css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont ) { css::awt::FontDescriptor aFD; @@ -283,7 +282,6 @@ void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( Run } - void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( RuntimeException, std::exception ) { ContainerEvent aMulti( e ); @@ -328,7 +326,6 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even //= FmXGridControl - Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory) throw (css::uno::Exception) { @@ -1514,7 +1511,6 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException, std::exception ) } - void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException, std::exception ) { VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ac2b744ad6e1..52679d3085ab 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -528,7 +528,6 @@ void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _ //= cell controls - DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ ) :OPropertyChangeListener(m_aMutex) ,m_pModelChangeBroadcaster(nullptr) @@ -3127,8 +3126,6 @@ IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void) } - - FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl ) :OComponentHelper(m_aMutex) ,m_pColumn(pColumn) @@ -4321,7 +4318,6 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind } - IMPL_LINK_NOARG_TYPED(FmXListBoxCell, OnDoubleClick, ListBox&, void) { if (m_pBox) diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 56e68c269f8e..3333f797771d 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -144,8 +144,6 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS } - - namespace { diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index c7b1d1caa1f0..3f67bc63f832 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -402,5 +402,4 @@ namespace svx } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e28f9bf3814e..53b5f50de11c 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2234,11 +2234,9 @@ namespace svxform } - // class NavigatorFrameManager - SFX_IMPL_DOCKINGWINDOW( DataNavigatorManager, SID_FM_SHOW_DATANAVIGATOR ) diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index fe88160c9457..184be709c7de 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -47,6 +47,4 @@ namespace svxform { namespace charset_helper } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 2f413e65c552..6134e956100a 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -141,7 +141,6 @@ Image FmFilterData::GetImage() const } - FmParentData::~FmParentData() { for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin(); @@ -150,7 +149,6 @@ FmParentData::~FmParentData() } - Image FmFormItem::GetImage() const { ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); @@ -158,7 +156,6 @@ Image FmFormItem::GetImage() const } - FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const { for ( ::std::vector< FmFilterData* >::const_iterator i = m_aChildren.begin(); @@ -182,7 +179,6 @@ Image FmFilterItems::GetImage() const } - FmFilterItem::FmFilterItem( FmFilterItems* pParent, const OUString& aFieldName, const OUString& aText, @@ -1253,7 +1249,6 @@ IMPL_LINK_NOARG_TYPED(FmFilterNavigator, OnDropActionTimer, Timer *, void) } - sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt ) { Point aDropPos = rEvt.maPosPixel; diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index bb63fed3b326..ec6aabfee384 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -47,7 +47,6 @@ using namespace ::svxform; } - // Encapsulation violation: We *know* that // SvxUnoDrawMSFactory::createInstanceWithArguments() always throws. diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index a61abcfb923d..ec8c171c8f42 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -74,7 +74,6 @@ namespace svxform using namespace ::com::sun::star::sdbc; - namespace { diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 58428a6ced0a..0880968c309e 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -28,7 +28,6 @@ #include <tools/diagnose_ex.h> - namespace svxform { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 53bb185cbe8c..316f951c5dcb 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -82,7 +82,6 @@ FmNavInsertedHint::~FmNavInsertedHint() } - // class FmNavInsertedHint FmNavModelReplacedHint::FmNavModelReplacedHint( FmEntryData* pAffectedEntryData ) @@ -599,11 +598,9 @@ namespace svxform } - // class NavigatorFrameManager - SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER ) diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index e8f319c5380e..aed2077ddac6 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -26,7 +26,6 @@ // class FmInterfaceItem - bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -54,6 +53,4 @@ SfxPoolItem* FmInterfaceItem::Create( SvStream& /*rStrm*/, sal_uInt16 ) const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 4f8e5e363dd3..115dfa0d739c 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -235,5 +235,4 @@ IMPL_STATIC_LINK_TYPED( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 41a1aef3b029..cf4d5919a6fd 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -53,7 +53,6 @@ using com::sun::star::container::XChild; using com::sun::star::container::XNameContainer; - FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage) :SdrPage(rModel, bMasterPage) ,m_pImpl( new FmFormPageImpl( *this ) ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 746ed8f73bac..c3ac0373e72a 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3970,7 +3970,6 @@ bool FmXFormShell::HasControlFocus() const } - SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xStartingPoint) :IndexAccessIterator(xStartingPoint) { @@ -4015,8 +4014,6 @@ bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*x } - - SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem); @@ -4091,5 +4088,4 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index ac5f78dbd59f..75fe9ef63ab4 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star::beans; using namespace ::svxform; - // = FmSearchThread void FmSearchThread::run() @@ -663,7 +662,6 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString } - FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, const Reference< XResultSet > & xCursor, const OUString& sVisibleFields, const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode) diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 9b787da6af25..0f10576c636f 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -183,7 +183,6 @@ namespace svx }; - FmFocusListenerAdapter::FmFocusListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IFocusObserver* _pObserver ) :m_pObserver( _pObserver ) ,m_xWindow( _rxControl, UNO_QUERY ) diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 497bdeafd629..22c812daaa59 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -341,7 +341,6 @@ void FmXDisposeMultiplexer::dispose() } - sal_Int16 getControlTypeByObject(const Reference< css::lang::XServiceInfo>& _rxObject) { // ask for the persistent service name diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 0be8b170021d..e07570a14778 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -164,7 +164,6 @@ struct PropertySetInfo typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache; - OUString static_STR_UNDO_PROPERTY; @@ -827,7 +826,6 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & } - void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "FmXUndoEnvironment::switchListening: invalid container!" ); @@ -963,7 +961,6 @@ void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement } - FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyChangeEvent& evt) :SdrUndoAction(rNewMod) ,xObj(evt.Source, UNO_QUERY) @@ -978,7 +975,6 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC } - void FmUndoPropertyAction::Undo() { FmXUndoEnvironment& rEnv = static_cast<FmFormModel&>(rMod).GetUndoEnv(); @@ -1028,7 +1024,6 @@ OUString FmUndoPropertyAction::GetComment() const } - FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod, Action _eAction, const Reference< XIndexContainer > & xCont, @@ -1072,7 +1067,6 @@ FmUndoContainerAction::~FmUndoContainerAction() } - void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xElem ) { Reference< XComponent > xComp( xElem, UNO_QUERY ); @@ -1216,7 +1210,6 @@ FmUndoModelReplaceAction::~FmUndoModelReplaceAction() } - void FmUndoModelReplaceAction::DisposeElement( const css::uno::Reference< css::awt::XControlModel>& xReplaced ) { Reference< XComponent > xComp(xReplaced, UNO_QUERY); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index d3ff3b1ef636..5c84e2ac1303 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -79,9 +79,6 @@ using namespace ::svxform; using namespace ::svx; - - - FmFormView::FmFormView( FmFormModel* pModel, OutputDevice* pOut ) :E3dView(pModel,pOut) { diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index ce7fa4d60649..e72141ac66c7 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -2380,7 +2380,6 @@ void FormController::stopListening() } - Reference< XControl > FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,bool _bRemove,bool _bOverWrite) const { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 02a1f9cf70ad..df966602450c 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1362,7 +1362,6 @@ namespace svxform } - // insert form GetNavModel()->Insert( pNewFormData, TREELIST_APPEND, true ); @@ -1548,7 +1547,6 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnClipboardAction, OLocalExchange&, void) { if ( !m_aControlExchange.isClipboardOwner() ) @@ -2178,5 +2176,4 @@ namespace svxform } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index f949bd35019f..05d6c73bd798 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -219,7 +219,6 @@ namespace svxform } - void NavigatorTreeModel::SetModified( bool bMod ) { if( !m_pFormShell ) return; @@ -965,5 +964,4 @@ namespace svxform } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 3d6e58b62235..8665ab4639c0 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -50,5 +50,4 @@ namespace svxform } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index bc3ee5784134..5bb570f33bbb 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -398,7 +398,6 @@ void FmFieldWin::Resize() Size aOutputSize( GetOutputSizePixel() ); - // adapt size of css::form::ListBox Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER ); Size aLBSize( aOutputSize ); diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx index 40412ed1270f..4c5872c81f7b 100644 --- a/svx/source/gallery2/codec.cxx +++ b/svx/source/gallery2/codec.cxx @@ -25,7 +25,6 @@ // - GalleryCodec - - GalleryCodec::GalleryCodec( SvStream& rIOStm ) : rStm( rIOStm ) { diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index cfbb7dcfe7fb..5f9913852c34 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1312,7 +1312,6 @@ OUString GalleryBrowser2::GetFilterName() const } - IMPL_LINK_NOARG_TYPED(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) { ImplUpdateInfoBar(); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index a54d30e1e041..ec1641db3c18 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -61,7 +61,6 @@ using namespace ::com::sun::star; // - SgaTheme - - GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ) : m_bDestDirRelative(false) , pParent(pGallery) diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index aff5046e2510..c027e75ef90b 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -46,7 +46,6 @@ class FrameSelector; namespace a11y { - class AccFrameSelector : public ::cppu::WeakImplHelper< css::accessibility::XAccessible, @@ -126,7 +125,6 @@ private: }; - } } diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 330002007863..9826f91b5970 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -113,7 +113,6 @@ namespace svx }; - typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible, css::accessibility::XAccessibleTable > OAccessibleHelper_Base; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 531c67661efc..c22b00800d6a 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -59,7 +59,6 @@ class FmFormShell; - namespace svxform { @@ -306,7 +305,6 @@ namespace svxform }; - typedef std::vector< VclPtr<XFormsPage> > PageList; typedef ::rtl::Reference < DataListener > DataListener_ref; diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 4ebaff8eb0e6..7fb6dcbd6bcc 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -28,7 +28,6 @@ namespace svxform { - //= DelayedEvent /** small class which encapsulates posting a Link instance as ApplicationUserEvent diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 42ba89a242ad..f0ed25cfc09d 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -190,7 +190,6 @@ protected: }; - class OFilterItemExchange : public OLocalExchange { ::std::vector<FmFilterItem*> m_aDraggedEntries; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 8440b999767d..6bdad805813d 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -39,8 +39,6 @@ namespace svxform { - - typedef ::std::set< SvTreeListEntry* > ListBoxEntrySet; @@ -231,7 +229,6 @@ namespace svxform }; - inline bool OControlExchange::hasFieldExchangeFormat( const DataFlavorExVector& _rFormats ) { return hasFormat( _rFormats, getFieldExchangeFormatId() ); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index c3d225123c28..7ea2e9829e2d 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -257,7 +257,6 @@ public: }; - class FmControlData : public FmEntryData { css::uno::Reference< css::form::XFormComponent > m_xFormComponent; @@ -285,8 +284,6 @@ public: }; - - namespace svxform { diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 9167569f4c06..7e3dbd3b128f 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -55,7 +55,6 @@ inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy } - #endif // INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx index de9841d4f218..bca6f69bcd9a 100644 --- a/svx/source/inc/fmscriptingenv.hxx +++ b/svx/source/inc/fmscriptingenv.hxx @@ -30,7 +30,6 @@ namespace svxform { - //= IFormScriptingEnvironment /** describes the interface implemented by a component which handles scripting requirements diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 77d60fa08479..d4010f7385db 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -303,7 +303,6 @@ private: }; - #endif // INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 073b9100701a..e3fbb3259e70 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -93,7 +93,6 @@ private: }; - typedef std::vector< FrameBorder* > FrameBorderPtrVec; struct FrameSelectorImpl : public Resource @@ -223,7 +222,6 @@ struct FrameSelectorImpl : public Resource }; - /** Dummy predicate for frame border iterators to use all borders in a container. */ struct FrameBorderDummy_Pred { diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 04082d3ca5e6..3080ab730b1d 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -336,7 +336,6 @@ private: }; - inline bool DbCellControl::isValuePropertyLocked() const { return m_bAccessingValueProperty; diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 3ab1663ed2d9..5bfe6e1bd4bd 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -30,7 +30,6 @@ namespace svxform { - //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service class DataColumn diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 565174ef6e1c..fc13f378425e 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -64,7 +64,6 @@ bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId } - bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -81,21 +80,18 @@ bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const } - SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const { return new SvxSmartTagItem( *this ); } - SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const { return rStream; } - SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const { return nullptr; diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 54720b99e83e..ec1f4e47e9f9 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -57,7 +57,6 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, bool bStacked, cons } - bool SvxOrientationItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -70,7 +69,6 @@ bool SvxOrientationItem::GetPresentation } - bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { table::CellOrientation eUno = table::CellOrientation_STANDARD; @@ -109,7 +107,6 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } - OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); @@ -117,14 +114,12 @@ OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) } - SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const { return new SvxOrientationItem( *this ); } - SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt16 nVal; @@ -133,14 +128,12 @@ SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const } - sal_uInt16 SvxOrientationItem::GetValueCount() const { return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1 } - bool SvxOrientationItem::IsStacked() const { return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED; @@ -184,7 +177,6 @@ SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) : } - SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop, sal_Int16 nRight, @@ -200,8 +192,6 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, } - - SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : SfxPoolItem( rItem.Which() ) @@ -213,7 +203,6 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) : } - bool SvxMarginItem::GetPresentation ( SfxItemPresentation ePres, @@ -262,7 +251,6 @@ bool SvxMarginItem::GetPresentation } - bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -274,14 +262,12 @@ bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const { return new SvxMarginItem(*this); } - SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_Int16 nLeft; @@ -296,7 +282,6 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const } - SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { rStream.WriteInt16( nLeftMargin ); @@ -307,8 +292,6 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) } - - bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -336,7 +319,6 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } - bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); @@ -367,28 +349,24 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - void SvxMarginItem::SetLeftMargin( sal_Int16 nLeft ) { nLeftMargin = nLeft; } - void SvxMarginItem::SetTopMargin( sal_Int16 nTop ) { nTopMargin = nTop; } - void SvxMarginItem::SetRightMargin( sal_Int16 nRight ) { nRightMargin = nRight; } - void SvxMarginItem::SetBottomMargin( sal_Int16 nBottom ) { nBottomMargin = nBottom; diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 0815388e96a4..429e2834dc48 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; - SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);} SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : @@ -40,21 +39,18 @@ SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : } - SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartStyleItem(*this); } - SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartStyleItem(rIn, Which()); @@ -66,14 +62,12 @@ SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) : } - SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartDataDescrItem(*this); } - SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartDataDescrItem(rIn, Which()); @@ -86,28 +80,24 @@ SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder, } - SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartTextOrderItem(*this); } - SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartTextOrderItem(rIn, Which()); } - bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // the order of the two enums is not equal, so a mapping is required @@ -132,7 +122,6 @@ bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMember } - bool SvxChartTextOrderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // the order of the two enums is not equal, so a mapping is required @@ -173,14 +162,12 @@ SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) : } - SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartTextOrientItem(*this); } - SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartTextOrientItem(rIn, Which()); @@ -193,7 +180,6 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) : } - SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : SfxPoolItem(rItem), fVal(rItem.fVal) @@ -201,14 +187,12 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) : } - OUString SvxDoubleItem::GetValueText() const { return rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.' ); } - bool SvxDoubleItem::GetPresentation ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString& rText, @@ -226,21 +210,18 @@ bool SvxDoubleItem::GetPresentation } - bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const { return static_cast<const SvxDoubleItem&>(rItem).fVal == fVal; } - SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxDoubleItem(*this); } - SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const { double _fVal; @@ -272,28 +253,24 @@ SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, } - SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartKindErrorItem(*this); } - SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartKindErrorItem(rIn, Which()); } - sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) @@ -308,28 +285,24 @@ SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, } - SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartIndicateItem(*this); } - SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartIndicateItem(rIn, Which()); } - sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) @@ -344,28 +317,24 @@ SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, } - SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } - SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const { return new SvxChartRegressItem(*this); } - SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartRegressItem(rIn, Which()); } - sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 213189d8028a..a0aec77420b3 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -111,7 +111,6 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) : } - bool SvxGradientListItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -159,7 +158,6 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) : } - bool SvxHatchListItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 634070377bed..9604bcecd2bc 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star; - SvxB3DVectorItem::SvxB3DVectorItem() { } @@ -36,7 +35,6 @@ SvxB3DVectorItem::~SvxB3DVectorItem() } - SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) : SfxPoolItem( _nWhich ), aVal( rVal ) @@ -44,7 +42,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector } - SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : SfxPoolItem( rItem ), aVal( rItem.aVal ) @@ -52,7 +49,6 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) : } - bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); @@ -60,14 +56,12 @@ bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const } - SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const { return new SvxB3DVectorItem( *this ); } - SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const { basegfx::B3DVector aStr; @@ -79,7 +73,6 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/ } - SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { @@ -93,7 +86,6 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ } - bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { assert(!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ())); @@ -110,7 +102,6 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) con } - bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { drawing::Direction3D aDirection; @@ -127,7 +118,6 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) } - sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX : 0; diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index 51d0cf7f1ba8..212cded5d461 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/Sequence.hxx> - SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; } SvxGalleryItem::SvxGalleryItem() diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 4e485f04f052..b033f8fe8bbb 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -80,7 +80,6 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const } - bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); @@ -149,6 +148,4 @@ bool SvxGrfCrop::GetPresentation( } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 8b8f1852f35f..5ff6e27ca847 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -25,8 +25,6 @@ #include "svx/hlnkitem.hxx" - - SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new SvxHyperlinkItem(0);} #define HYPERLINKFF_MARKER 0x599401FE diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index b7be0282428b..12dc40982188 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -38,9 +38,6 @@ const double SvxNumberFormatShell::DEFAULT_NUMVALUE = 1234.56789; - - - SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -61,7 +58,6 @@ SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumForma } - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -93,7 +89,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } - SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, sal_uInt32 nFormatKey, SvxNumberValueType eNumValType, @@ -130,7 +125,6 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter* pNumFormatter, } - SvxNumberFormatShell::~SvxNumberFormatShell() { /* @@ -153,14 +147,12 @@ SvxNumberFormatShell::~SvxNumberFormatShell() } - size_t SvxNumberFormatShell::GetUpdateDataCount() const { return aDelList.size(); } - void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ) { const size_t nListSize = aDelList.size(); @@ -173,7 +165,6 @@ void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt3 } - void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, short& rFmtSelPos, std::vector<OUString>& rFmtEntries ) @@ -190,7 +181,6 @@ void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos, } - void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, short& rFmtSelPos, std::vector<OUString>& rFmtEntries ) @@ -203,7 +193,6 @@ void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType, } - void SvxNumberFormatShell::FormatChanged( sal_uInt16 nFmtLbPos, OUString& rPreviewStr, Color*& rpFontColor ) @@ -299,7 +288,6 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos, } - bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, sal_uInt16& rCatLbSelPos, short& rFmtSelPos, @@ -335,7 +323,6 @@ bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat, } - void SvxNumberFormatShell::MakeFormat( OUString& rFormat, bool bThousand, bool bNegRed, sal_uInt16 nPrecision, sal_uInt16 nLeadingZeroes, @@ -418,7 +405,6 @@ void SvxNumberFormatShell::GetOptions( const OUString& rFormat, } - void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, OUString& rPreviewStr, Color*& rpFontColor ) @@ -453,7 +439,6 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr, } - bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) { sal_uInt32 nFound = pFormatter->GetEntryKey( rFmtString, eCurLanguage ); @@ -479,7 +464,6 @@ bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString ) } - bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pAt /* = NULL */ ) { bool bRes=false; @@ -508,8 +492,6 @@ bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pA } - - void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, LanguageType& rLangType, sal_uInt16& nFmtLbSelPos, @@ -534,7 +516,6 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, eCurLanguage )); - CategoryToPos_Impl( nCurCategory, nCatLbPos ); rLangType = eCurLanguage; @@ -547,7 +528,6 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos, } - short SvxNumberFormatShell::FillEntryList_Impl( std::vector<OUString>& rList ) { /* Erstellen einer aktuellen Liste von Format-Eintraegen. @@ -1101,8 +1081,6 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, } - - void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpColor ) { rpColor = nullptr; @@ -1122,28 +1100,24 @@ void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpC } - ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetRemoved_Impl( size_t nKey ) { return ::std::find(aDelList.begin(), aDelList.end(), nKey); } - bool SvxNumberFormatShell::IsRemoved_Impl( size_t nKey ) { return GetRemoved_Impl( nKey ) != aDelList.end(); } - ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetAdded_Impl( size_t nKey ) { return ::std::find(aAddList.begin(), aAddList.end(), nKey); } - bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey ) { return GetAdded_Impl( nKey ) != aAddList.end(); diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 630218127468..31c3374bb601 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -20,8 +20,6 @@ #include <svx/numinf.hxx> - - #define INIT(pNum,eVal,nDouble,rStr) \ SfxPoolItem ( nId ), \ \ @@ -40,7 +38,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const sal_uInt16 nId ) : @@ -50,7 +47,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const OUString& rVal, const sal_uInt16 nId ) : @@ -60,7 +56,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const sal_uInt16 nId ) : @@ -70,7 +65,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, } - SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const OUString& rValueStr, const sal_uInt16 nId ) : @@ -83,7 +77,6 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, #undef INIT - SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : SfxPoolItem( rItem.Which() ), @@ -106,14 +99,12 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : } - SvxNumberInfoItem::~SvxNumberInfoItem() { delete [] pDelFormatArr; } - bool SvxNumberInfoItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -127,7 +118,6 @@ bool SvxNumberInfoItem::GetPresentation } - bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" ); @@ -161,7 +151,6 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const } - SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const { return new SvxNumberInfoItem( *this ); @@ -176,14 +165,12 @@ SfxPoolItem* SvxNumberInfoItem::Create( SvStream& /*rStream*/, sal_uInt16 ) cons } - SvStream& SvxNumberInfoItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/ ) const { return rStream; } - void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData, const sal_uInt32 nCount ) { diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 6153f0e75776..c6de545ccba3 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -80,7 +80,6 @@ inline OUString GetUsageText( const sal_uInt16 eU ) } - bool SvxPageItem::GetPresentation ( SfxItemPresentation ePres, @@ -218,7 +217,6 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } - SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_uInt8 eType; @@ -241,7 +239,6 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const } - SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { // UNICODE: rStrm << aDescName; @@ -276,7 +273,6 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const } - bool SvxSetItem::GetPresentation ( SfxItemPresentation /*ePres*/, diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 97cc424b3f70..1741b8f3f580 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -23,8 +23,6 @@ #include <svx/dialmgr.hxx> - - SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); } SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); } SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); } @@ -35,7 +33,6 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich ) } - SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rAuthor ) @@ -43,7 +40,6 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor, } - bool SvxPostItAuthorItem::GetPresentation ( SfxItemPresentation ePres, @@ -66,7 +62,6 @@ bool SvxPostItAuthorItem::GetPresentation } - SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const { return new SvxPostItAuthorItem( *this ); @@ -78,7 +73,6 @@ SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 _nWhich ) } - SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rDate ) @@ -86,7 +80,6 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich } - bool SvxPostItDateItem::GetPresentation ( SfxItemPresentation ePres, @@ -109,7 +102,6 @@ bool SvxPostItDateItem::GetPresentation } - SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const { return new SvxPostItDateItem( *this ); @@ -121,7 +113,6 @@ SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich ) } - SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich ) : SfxStringItem( _nWhich, rText ) @@ -129,7 +120,6 @@ SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich } - bool SvxPostItTextItem::GetPresentation ( SfxItemPresentation ePres, @@ -152,7 +142,6 @@ bool SvxPostItTextItem::GetPresentation } - SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const { return new SvxPostItTextItem( *this ); diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index c3fa82b4bd50..11c76c6aceb7 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -138,5 +138,4 @@ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index ea349097cd44..986348466f47 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -26,7 +26,6 @@ #include <osl/diagnose.h> - SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; } #define VIEWLAYOUT_PARAM_COLUMNS "Columns" @@ -34,7 +33,6 @@ SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; #define VIEWLAYOUT_PARAMS 2 - SvxViewLayoutItem::SvxViewLayoutItem ( sal_uInt16 nColumns, @@ -47,7 +45,6 @@ SvxViewLayoutItem::SvxViewLayoutItem } - SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ), mbBookMode( rOrig.IsBookMode() ) @@ -55,34 +52,29 @@ SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig ) } - SvxViewLayoutItem::~SvxViewLayoutItem() { } - SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxViewLayoutItem( *this ); } - SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { return nullptr; } - SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } - bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 6b8cb85617a7..a4db8d27b872 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -25,8 +25,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> - - SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; } #define ZOOMSLIDER_PARAM_CURRENTZOOM "Columns" @@ -36,14 +34,12 @@ SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; #define ZOOMSLIDER_PARAMS 4 - SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom ) { } - SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig ) : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ) , maValues( rOrig.maValues ) @@ -53,34 +49,29 @@ SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig ) } - SvxZoomSliderItem::~SvxZoomSliderItem() { } - SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const { return new SvxZoomSliderItem( *this ); } - SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const { return nullptr; } - SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { return rStrm; } - bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index f514f8061dcf..fe6a91cf922b 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - SFX_IMPL_TOOLBOX_CONTROL( SvxClipBoardControl, SfxVoidItem /*SfxUInt16Item*/ ); @@ -141,6 +140,4 @@ void SvxClipBoardControl::DelPopup() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index 38b1b763e5ca..ea92075faff7 100644 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -32,7 +32,6 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem); - /* [Beschreibung] Ctor; setzt den Select-Handler am Men"u und tr"agt das Men"u @@ -55,7 +54,6 @@ SvxFontMenuControl::SvxFontMenuControl } - /* [Beschreibung] F"ullt das Men"u mit den aktuellen Fonts aus der Fontlist @@ -77,7 +75,6 @@ void SvxFontMenuControl::FillMenu() } - /* [Beschreibung] Statusbenachrichtigung; @@ -109,7 +106,6 @@ void SvxFontMenuControl::StateChanged( } - /* [Beschreibung] Statusbenachrichtigung "uber Bindings; bei DOCCHANGED @@ -126,7 +122,6 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - /* [Beschreibung] Select-Handler des Men"us; der Name des selektierten Fonts diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 984391e91c40..0c7266f1532c 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -41,7 +41,6 @@ SFX_IMPL_MENU_CONTROL(SvxFontSizeMenuControl, SvxFontHeightItem); - /* [Beschreibung] Select-Handler des Men"us; die aktuelle Fontgr"o\se @@ -65,7 +64,6 @@ IMPL_LINK_TYPED( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen, void ) } - /* [Beschreibung] Statusbenachrichtigung; @@ -149,7 +147,6 @@ void SvxFontSizeMenuControl::StateChanged( } - /* [Beschreibung] Ctor; setzt den Select-Handler am Men"u und tr"agt Men"u @@ -174,7 +171,6 @@ SvxFontSizeMenuControl::SvxFontSizeMenuControl } - /* [Beschreibung] Dtor; gibt das Men"u frei. @@ -186,5 +182,4 @@ SvxFontSizeMenuControl::~SvxFontSizeMenuControl() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index bc7b573fcc16..d2320578e039 100644 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx @@ -27,7 +27,6 @@ #include <comphelper/lok.hxx> - namespace sdr { namespace animation diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx index 10d79563b3ef..830056fa0993 100644 --- a/svx/source/sdr/animation/objectanimator.cxx +++ b/svx/source/sdr/animation/objectanimator.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/animation/animationstate.hxx> - namespace sdr { namespace animation diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index 8ecad40b6dd4..7d53ec205d3b 100644 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx @@ -21,7 +21,6 @@ #include <sdr/attribute/sdrfilltextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 723986f62ab4..e5191cf07693 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -143,7 +143,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx index 9f52a9d747b5..22022e8f432c 100644 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx index 4268c8bff26c..fb232e3c677a 100644 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx index 44b084a2e76a..fd4f12ff3293 100644 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx @@ -21,7 +21,6 @@ #include <svx/sdr/attribute/sdrshadowtextattribute.hxx> - namespace drawinglayer { namespace attribute diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index 4b9f2f41ee91..fd6fc102ae61 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -20,7 +20,6 @@ #include <svx/sdr/contact/displayinfo.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 09adf9835a88..3abc208c3df7 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -37,13 +37,11 @@ SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMedi } - SdrMediaWindow::~SdrMediaWindow() { } - void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -59,7 +57,6 @@ void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) } - void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -74,7 +71,6 @@ void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) } - void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -89,7 +85,6 @@ void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) } - void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -99,7 +94,6 @@ void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) } - void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -109,7 +103,6 @@ void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) } - void SdrMediaWindow::Command( const CommandEvent& rCEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -124,7 +117,6 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt ) } - sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -144,7 +136,6 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) } - sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); @@ -164,7 +155,6 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } - void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) { vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index af037e58dcb3..1a9f1006ea16 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index a9893045d222..d839c2fcda5b 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -37,7 +37,6 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 8e84436b6be3..1078ae49eeb7 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -27,7 +27,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 8ce64caa6d13..a47f1eaf61e6 100644 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx @@ -25,7 +25,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index ed1dc0cd6990..863f9dea3012 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -30,7 +30,6 @@ #include <svx/sxmtpitm.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index d620346797db..b0237255a892 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -30,7 +30,6 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index 8e8e24fb1458..90333ca078f3 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx @@ -30,11 +30,9 @@ #include <basegfx/tools/canvastools.hxx> - using namespace com::sun::star; - namespace { // Helper method to recursively travel the DrawHierarchy for 3D objects contained in @@ -54,7 +52,6 @@ namespace } // end of anonymous namespace - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index dd68629779e6..9632e98849fe 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -66,7 +66,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 8d9fd7ba96a7..60e49cc9abd2 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 437319b6ab39..993251266fef 100644 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx @@ -30,7 +30,6 @@ #include <basegfx/polygon/b2dpolygon.hxx> - namespace sdr { namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index cdc5cc2a4112..1c095b02af69 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -59,7 +59,6 @@ ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() } - vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const { vcl::Window* pRetval = nullptr; @@ -77,7 +76,6 @@ vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const } - Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const { Size aRet; @@ -89,7 +87,6 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const } - void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const { if( mpMediaWindow ) @@ -117,7 +114,6 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte } - void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem ) { if( mpMediaWindow ) @@ -133,7 +129,6 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte } - }} // end of namespace sdr::contact /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 50625289caff..ebc36b8e4f0b 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -42,7 +42,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace event @@ -116,7 +115,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace event diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index bc26abeefab4..5cd9f00ca9dc 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx @@ -24,7 +24,6 @@ #include <sdr/overlay/overlaytools.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index cf24af631a97..110e7af5afbb 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx @@ -24,7 +24,6 @@ #include <sdr/overlay/overlaytools.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index c3fa5189919d..0640bb5e5fb3 100644 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx @@ -23,7 +23,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index 95958b277c6e..5b98c5a70acd 100644 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx @@ -24,7 +24,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 17da890f3ce9..d1e8f08c7bda 100644 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx @@ -27,7 +27,6 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 27faabd67acb..a742e87c7984 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index ddc49ae5592b..65f6cfbf4c39 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -31,7 +31,6 @@ #include <vcl/dibtools.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 09d1d948687f..1ca9ddabc972 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> - namespace sdr { namespace overlay @@ -184,7 +183,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index cacb03f52b93..a784eccc4dae 100644 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx @@ -25,7 +25,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index c62234355dd0..d6e786467bb4 100644 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx @@ -23,7 +23,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx index 92932f50af51..c7dbb414c784 100644 --- a/svx/source/sdr/overlay/overlayrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrectangle.cxx @@ -29,7 +29,6 @@ #include <vcl/settings.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index a633ab7f0d50..9a1e55398e50 100644 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx @@ -27,7 +27,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 3c308af8ea09..e0f1c2d3645f 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -31,7 +31,6 @@ #include <svx/sdr/overlay/overlaymanager.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index b333ce212179..07dcd95f6d69 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -213,7 +213,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -286,7 +285,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -420,7 +418,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -538,7 +535,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index 1785ce8fde30..088c8eacdea2 100644 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx @@ -28,7 +28,6 @@ #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> - namespace sdr { namespace overlay diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index e25d6346a02d..86b72a6b43ac 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -211,7 +211,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 56eeb3012cb0..9bb8bbe761f3 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -25,11 +25,9 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index 89e390eb2c91..42a1c77f2c38 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -26,11 +26,9 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index e0f9386f915b..9ef411eb71d3 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -26,11 +26,9 @@ #include <drawinglayer/attribute/sdrlineattribute.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 7d41b77eb2ed..df16a3af0d9c 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 7838393d63a9..03a0ede39ba3 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -28,11 +28,9 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -143,7 +141,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index d9b7a4365b67..8c0b0d9a0b96 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 20b01401b756..c243436a4f4f 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -25,11 +25,9 @@ #include <basegfx/polygon/b2dpolygon.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index 0594716fd427..95087a9d8737 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -29,7 +29,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 8e5d2cffe3dc..0eb983750cce 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -25,11 +25,9 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index 2e0187bd3aad..e8baae150d7d 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -26,11 +26,9 @@ #include <basegfx/polygon/b2dpolygon.hxx> - using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index d1b8a003474e..ededd4d16609 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -33,11 +33,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> - using namespace com::sun::star; - namespace { sal_Int16 getPageNumber(const uno::Reference< drawing::XDrawPage >& rxDrawPage) @@ -85,7 +83,6 @@ namespace } // end of anonymous namespace - namespace drawinglayer { namespace primitive2d @@ -246,7 +243,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -299,7 +295,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -355,7 +350,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -432,7 +426,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 25ec9740305e..bb8ab021274a 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -29,7 +29,6 @@ #include <drawinglayer/attribute/sdrobjectattribute3d.hxx> - namespace drawinglayer { namespace primitive2d diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index ea0ffce344cd..a9955c21df14 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -43,7 +43,6 @@ #include <svl/smplhint.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index b1fd15c9b737..85cd0099311c 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -25,7 +25,6 @@ #include <svx/svdocapt.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index af9aaf623365..1da3816b498a 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -27,7 +27,6 @@ #include <svx/sxciaitm.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 122034324811..7ab5fc431ebf 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -25,7 +25,6 @@ #include <svx/svdoedge.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 3dd95d1ea784..ac387cc747f5 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -27,7 +27,6 @@ #include <svl/smplhint.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 338cfedf1ec3..e06e66714607 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -30,7 +30,6 @@ #include <editeng/eeitem.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index 0361ab6e9d30..c454a6b9a2f5 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -23,7 +23,6 @@ #include <svx/scene3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index f17414c99d1a..c511471a4f1c 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -22,7 +22,6 @@ #include <svx/extrud3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 83f3f0190efa..b8847d061eab 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -22,7 +22,6 @@ #include <svx/lathe3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 8b8ffde8dde8..fd49afc1c13f 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -23,7 +23,6 @@ #include <svx/obj3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index f4f30c0aca1f..6190b4bcbaa0 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -22,7 +22,6 @@ #include <svx/sphere3d.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 8dac8e14558e..09a0f7cab5a7 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -26,7 +26,6 @@ #include <svx/sdgcpitm.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index f902c05aef6f..6e7e82890f9c 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -27,7 +27,6 @@ #include <svx/svdpage.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 6a34946099f2..bef396c1ec41 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -90,7 +90,6 @@ namespace sdr } // end of namespace sdr - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index 585b28eb65b0..634ca771b441 100644 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx @@ -24,7 +24,6 @@ #include <svx/xlineit0.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx index bf93438fc2ff..c1d9c381737f 100644 --- a/svx/source/sdr/properties/rectangleproperties.cxx +++ b/svx/source/sdr/properties/rectangleproperties.cxx @@ -21,7 +21,6 @@ #include <svx/svdorect.hxx> - namespace sdr { namespace properties diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx index 3a70fa51b94c..53f40f4b3bbb 100644 --- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx +++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx @@ -51,8 +51,6 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( } - - void ContextChangeEventMultiplexer::NotifyContextChange ( SfxViewShell* pViewShell, const ::sfx2::sidebar::EnumContext::Context eContext) @@ -62,8 +60,6 @@ void ContextChangeEventMultiplexer::NotifyContextChange ( } - - ::rtl::OUString ContextChangeEventMultiplexer::GetModuleName ( const css::uno::Reference<css::frame::XFrame>& rxFrame) { diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index 10cfb3c606fb..c5ef64750cb2 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -44,8 +44,6 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent) } - - EmptyPanel::~EmptyPanel() { disposeOnce(); diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 8cc30e697b0a..28e67c8acca6 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -98,15 +98,11 @@ PanelFactory::PanelFactory() } - - PanelFactory::~PanelFactory() { } - - Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index 2e05c379162f..a4c6dbf4d007 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -90,8 +90,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark } - - EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( const SdrMarkList& rMarkList, const ViewType eViewType) @@ -198,8 +196,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD ( } - - EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt16 nObjectId) { switch (nObjectId) @@ -245,8 +241,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt } - - EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( const sal_uInt16 nObjectId, const ViewType eViewType) @@ -311,8 +305,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( } - - sal_uInt32 SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkList) { const size_t nMarkCount (rMarkList.GetMarkCount()); @@ -338,8 +330,6 @@ sal_uInt32 SelectionAnalyzer::GetInventorTypeFromMark (const SdrMarkList& rMarkL } - - sal_uInt16 SelectionAnalyzer::GetObjectTypeFromGroup (const SdrObject* pObj) { SdrObjList* pObjList = pObj->GetSubList(); @@ -393,8 +383,6 @@ sal_uInt16 SelectionAnalyzer::GetObjectTypeFromGroup (const SdrObject* pObj) } - - sal_uInt16 SelectionAnalyzer::GetObjectTypeFromMark (const SdrMarkList& rMarkList) { const size_t nMarkCount (rMarkList.GetMarkCount()); @@ -444,8 +432,6 @@ sal_uInt16 SelectionAnalyzer::GetObjectTypeFromMark (const SdrMarkList& rMarkLi } - - bool SelectionAnalyzer::IsShapeType (const sal_uInt16 nType) { switch (nType) @@ -478,8 +464,6 @@ bool SelectionAnalyzer::IsShapeType (const sal_uInt16 nType) } - - bool SelectionAnalyzer::IsTextObjType (const sal_uInt16 nType) { switch(nType) @@ -496,7 +480,6 @@ bool SelectionAnalyzer::IsTextObjType (const sal_uInt16 nType) } - } } // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index 2c852ac21001..2cc8cc9b9a84 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -45,15 +45,11 @@ SelectionChangeHandler::SelectionChangeHandler ( } - - SelectionChangeHandler::~SelectionChangeHandler() { } - - void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject&) throw (uno::RuntimeException, std::exception) { @@ -70,16 +66,12 @@ void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject& } - - void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&) throw (uno::RuntimeException, std::exception) { } - - void SAL_CALL SelectionChangeHandler::disposing() throw (uno::RuntimeException) { @@ -88,8 +80,6 @@ void SAL_CALL SelectionChangeHandler::disposing() } - - void SelectionChangeHandler::Connect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); @@ -101,8 +91,6 @@ void SelectionChangeHandler::Connect() } - - void SelectionChangeHandler::Disconnect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index cecea95d8c5a..5d2878fb0637 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -95,7 +95,6 @@ private: } } // end of namespace svx::sidebar - #endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index b43fd3f04d5f..11364f05d6bb 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -38,7 +38,6 @@ using ::sfx2::sidebar::Theme; namespace svx { namespace sidebar { - GraphicPropertyPanel::GraphicPropertyPanel( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -145,10 +144,6 @@ void GraphicPropertyPanel::Initialize() } - - - - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) { const sal_Int16 nBright = mpMtrBrightness->GetValue(); @@ -157,7 +152,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) { const sal_Int16 nContrast = mpMtrContrast->GetValue(); @@ -166,7 +160,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) { const sal_Int16 nTrans = mpMtrTrans->GetValue(); @@ -175,7 +168,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) { const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos(); @@ -184,7 +176,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) { const sal_Int16 nRed = mpMtrRed->GetValue(); @@ -193,7 +184,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) { const sal_Int16 nGreen = mpMtrGreen->GetValue(); @@ -202,7 +192,6 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) { const sal_Int16 nBlue = mpMtrBlue->GetValue(); @@ -211,7 +200,6 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) } - IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, GammaHdl, Edit&, void) { const sal_Int32 nGamma = mpMtrGamma->GetValue(); @@ -220,7 +208,6 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, GammaHdl, Edit&, void) } - VclPtr<vcl::Window> GraphicPropertyPanel::Create ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -240,14 +227,12 @@ VclPtr<vcl::Window> GraphicPropertyPanel::Create ( } - void GraphicPropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) { } - void GraphicPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -454,12 +439,6 @@ void GraphicPropertyPanel::NotifyItemUpdate( } - - - - - - // namespace close }} // end of namespace svx::sidebar diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index 131e98959c9c..9ea856e1d0a3 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -88,8 +88,6 @@ void InsertPropertyPanel::dispose() } - - IMPL_LINK_TYPED(InsertPropertyPanel, WindowEventListener, VclWindowEvent&, rEvent, void) { // We will be getting a lot of window events (well, basically all diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index bc3d30e02ff0..c63f5587019b 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -51,7 +51,6 @@ const char USERITEM_NAME[] = "FitItem"; namespace svx { namespace sidebar { - PosSizePropertyPanel::PosSizePropertyPanel( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, @@ -182,7 +181,6 @@ namespace } // end of anonymous namespace - void PosSizePropertyPanel::Initialize() { //Position : Horizontal / Vertical @@ -252,7 +250,6 @@ VclPtr<vcl::Window> PosSizePropertyPanel::Create ( } - void PosSizePropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) { @@ -331,7 +328,6 @@ void PosSizePropertyPanel::HandleContextChange( } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && @@ -354,7 +350,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && @@ -377,21 +372,18 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosXHdl, Edit&, void ) { executePosX(); } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosYHdl, Edit&, void ) { executePosY(); } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) { if ( mpCbxScale->IsChecked() ) @@ -406,7 +398,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) { OUString sTmp = mpMtrAngle->GetText(); @@ -452,7 +443,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) } - IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) { sal_Int32 nTmp = mpDial->GetRotation(); @@ -468,7 +458,6 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) } - IMPL_LINK_TYPED( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) { const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId())); @@ -488,7 +477,6 @@ IMPL_LINK_TYPED( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) } - void PosSizePropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -817,11 +805,6 @@ void PosSizePropertyPanel::NotifyItemUpdate( } - - - - - void PosSizePropertyPanel::executeSize() { if ( mpMtrWidth->IsValueModified() || mpMtrHeight->IsValueModified()) @@ -867,7 +850,6 @@ void PosSizePropertyPanel::executeSize() } - void PosSizePropertyPanel::executePosX() { if ( mpMtrPosX->IsValueModified()) @@ -892,7 +874,6 @@ void PosSizePropertyPanel::executePosX() } - void PosSizePropertyPanel::executePosY() { if ( mpMtrPosY->IsValueModified() ) @@ -915,7 +896,6 @@ void PosSizePropertyPanel::executePosY() } - void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pState ) { bool bPosXBlank = false; @@ -954,7 +934,6 @@ void PosSizePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* } - FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ) { FieldUnit eUnit = FUNIT_NONE; @@ -989,7 +968,6 @@ FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPo } - void PosSizePropertyPanel::DisableControls() { if( mbPositionProtected ) diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 34a646d10ffc..4d0eb466ba32 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -187,7 +187,6 @@ private: } } // end of namespace svx::sidebar - #endif // INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index 6b28a252bbe2..e25dc9ae23e6 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -26,7 +26,6 @@ #include <svx/dlgctrl.hxx> - namespace svx { namespace sidebar { class ShadowPropertyPanel diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index ba03dd5335b1..1ab29dcda1bf 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -132,7 +132,6 @@ IMPL_LINK_NOARG_TYPED(Popup, PopupModeEndHandler, FloatingWindow*, void) } - } } // end of namespace svx::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 72a1baac0b56..b11a8324f903 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -81,7 +81,6 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status } - void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -107,7 +106,6 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, } - IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) { if (pTimer == nullptr) @@ -120,7 +118,6 @@ IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) } - void SvxModifyControl::_repaint() { if ( GetStatusBar().AreItemsVisible() ) @@ -169,5 +166,4 @@ void SvxModifyControl::Click() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index dc8a766bfdeb..861efa122a1a 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -45,7 +45,6 @@ #include <comphelper/processfactory.hxx> - /* [Description] Function used to create a text representation of @@ -88,7 +87,6 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) } - SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem); class FunctionPopup_Impl : public PopupMenu @@ -105,7 +103,6 @@ private: }; - FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) : PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ), nSelected( 0 ) @@ -115,7 +112,6 @@ FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) : } - void FunctionPopup_Impl::Select() { nSelected = GetCurItemId(); @@ -188,7 +184,6 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, } - /* [Description] Dtor(): @@ -202,7 +197,6 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl() } - /* [Description] SID_PSZ_FUNCTION activates the popup menu for Calc: @@ -302,7 +296,6 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt } - /* [Description] execute popup menu, when the status enables this @@ -342,7 +335,6 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) } - /* [Description] Depending on the type to be shown, the value us shown. First the diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 586d628a49f8..b68dd7961884 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -89,7 +89,6 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, } - void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { @@ -105,7 +104,6 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, } - bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) { SelectionTypePopup aPop( mnState ); @@ -135,7 +133,6 @@ bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) } - void SvxSelectionModeControl::Paint( const UserDrawEvent& rUsrEvt ) { const Rectangle aControlRect = getControlRect(); diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index a477eebac098..88714ebfc06a 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -52,7 +52,6 @@ private: }; - ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, SvxZoomEnableFlags nValueSet ) : PopupMenu(ResId(RID_SVXMNU_ZOOM, DIALOG_MGR())) , nZoom(nZ) @@ -75,7 +74,6 @@ ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, SvxZoomEnableFlags nValueSet ) } - void ZoomPopup_Impl::Select() { nCurId = GetCurItemId(); diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index ac9804db37ef..e9cbb38a1c0c 100644 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx @@ -179,7 +179,6 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons } - void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst) { diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 4ea659954b60..8d2ef4f3e5dd 100644 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx @@ -90,7 +90,6 @@ SdrObject* SdrObjectPrimitiveHit( } - SdrObject* SdrObjListPrimitiveHit( const SdrObjList& rList, const Point& rPnt, @@ -114,7 +113,6 @@ SdrObject* SdrObjListPrimitiveHit( } - bool ViewObjectContactPrimitiveHit( const SdrObject& rObject, const sdr::contact::ViewObjectContact& rVOC, diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 9b8f4aa3790d..642c86769d12 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -38,7 +38,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> - using namespace ::com::sun::star; struct SdrPageWindow::Impl @@ -303,7 +302,6 @@ namespace #endif // CLIPPER_TEST - void SdrPageWindow::RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector ) { // set Redirector diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index c35207e1049d..c18bfa5f3a46 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -186,7 +186,6 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio } - void SdrPaintWindow::impCreateOverlayManager() { // not yet one created? diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx index 374cb8f05f7c..4d020c8f0779 100644 --- a/svx/source/svdraw/sdrundomanager.cxx +++ b/svx/source/svdraw/sdrundomanager.cxx @@ -20,7 +20,6 @@ #include <svx/sdrundomanager.hxx> - SdrUndoManager::SdrUndoManager(sal_uInt16 nMaxUndoActionCount) : EditUndoManager(nMaxUndoActionCount) , maEndTextEditHdl() diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 5f0978d4d136..252e0810e135 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -625,7 +625,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) // FractionItem - SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): SfxPoolItem(nId) { @@ -695,7 +694,6 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const // ScaleItem - bool SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper *) const @@ -736,7 +734,6 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const // OnOffItem - SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrOnOffItem(Which(),GetValue()); @@ -802,7 +799,6 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, // class SdrPercentItem - SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrPercentItem(Which(),GetValue()); @@ -835,7 +831,6 @@ bool SdrPercentItem::GetPresentation( // class SdrAngleItem - SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrAngleItem(Which(),GetValue()); @@ -923,7 +918,6 @@ bool SdrAngleItem::GetPresentation( // class SdrMetricItem - SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMetricItem(Which(),GetValue()); @@ -973,7 +967,6 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, // items of the legend object - SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } @@ -1972,7 +1965,6 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) // class SdrSignedPercentItem - SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrSignedPercentItem( Which(), GetValue() ); diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 89f7c3fb3772..8866bd4cf193 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -118,7 +118,6 @@ ImplConnectMarkerOverlay::~ImplConnectMarkerOverlay() } - class ImpSdrCreateViewExtraData { // The OverlayObjects for XOR replacement @@ -179,11 +178,9 @@ void ImpSdrCreateViewExtraData::HideOverlay() } - // CreateView - void SdrCreateView::ImpClearConnectMarker() { if(mpCoMaOverlay) @@ -875,7 +872,6 @@ void SdrCreateView::HideCreateObj() } - bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(pAktCreate) diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 9d70c20a48b8..4ef94671eec7 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -74,7 +74,6 @@ #include <vector> - SdrDragEntry::SdrDragEntry() : mbAddToTransparent(false) { @@ -85,7 +84,6 @@ SdrDragEntry::~SdrDragEntry() } - SdrDragEntryPolyPolygon::SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon) : SdrDragEntry(), maOriginalPolyPolygon(rOriginalPolyPolygon) @@ -138,7 +136,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPolyPolygon::createPr } - SdrDragEntrySdrObject::SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) : SdrDragEntry(), maOriginal(rOriginal), @@ -205,7 +202,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrim } - SdrDragEntryPrimitive2DSequence::SdrDragEntryPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DSequence& rSequence, bool bAddToTransparent) @@ -231,7 +227,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPrimitive2DSequence:: } - SdrDragEntryPointGlueDrag::SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag) : maPositions(rPositions), mbIsPointDrag(bIsPointDrag) @@ -301,8 +296,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create } - - void SdrDragMethod::resetSdrDragEntries() { // clear entries; creation is on demand @@ -963,8 +956,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla } - - SdrDragMovHdl::SdrDragMovHdl(SdrDragView& rNewView) : SdrDragMethod(rNewView) { @@ -1178,8 +1169,6 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const } - - SdrDragObjOwn::SdrDragObjOwn(SdrDragView& rNewView) : SdrDragMethod(rNewView), mpClone(nullptr) @@ -1490,8 +1479,6 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const } - - void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/) { // for SdrDragMove, use current Primitive2DSequence of SdrObject visualization @@ -1768,8 +1755,6 @@ Pointer SdrDragMove::GetSdrDragPointer() const } - - SdrDragResize::SdrDragResize(SdrDragView& rNewView) : SdrDragMethod(rNewView), aXFact(1,1), @@ -2104,8 +2089,6 @@ Pointer SdrDragResize::GetSdrDragPointer() const } - - void SdrDragRotate::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { rTarget.Rotate(DragStat().GetRef1(), nAngle, sin(nAngle*nPi180), cos(nAngle*nPi180)); @@ -2240,8 +2223,6 @@ Pointer SdrDragRotate::GetSdrDragPointer() const } - - SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1) : SdrDragMethod(rNewView), aFact(1,1), @@ -2521,8 +2502,6 @@ Pointer SdrDragShear::GetSdrDragPointer() const } - - void SdrDragMirror::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { if(bMirrored) @@ -2651,8 +2630,6 @@ Pointer SdrDragMirror::GetSdrDragPointer() const } - - SdrDragGradient::SdrDragGradient(SdrDragView& rNewView, bool bGrad) : SdrDragMethod(rNewView), pIAOHandle(nullptr), @@ -2811,8 +2788,6 @@ Pointer SdrDragGradient::GetSdrDragPointer() const } - - SdrDragCrook::SdrDragCrook(SdrDragView& rNewView) : SdrDragMethod(rNewView), aFact(1,1), @@ -3447,8 +3422,6 @@ Pointer SdrDragCrook::GetSdrDragPointer() const } - - SdrDragDistort::SdrDragDistort(SdrDragView& rNewView) : SdrDragMethod(rNewView), nPolyPt(0), @@ -3600,8 +3573,6 @@ void SdrDragDistort::applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPol } - - SdrDragCrop::SdrDragCrop(SdrDragView& rNewView) : SdrDragObjOwn(rNewView) { diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 88dc38a92243..acc28ac97c0c 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -44,11 +44,9 @@ using namespace sdr; - // DragView - void SdrDragView::ImpClearVars() { mbFramDrag=false; @@ -200,7 +198,6 @@ bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, bool bTR ) const } - bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const { return false; @@ -831,7 +828,6 @@ void SdrDragView::HideDragObj() } - void SdrDragView::SetNoDragXorPolys(bool bOn) { if (IsNoDragXorPolys()!=bOn) diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index c2d705c17ff0..b974e89cbaa1 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -283,7 +283,6 @@ void SdrEditView::DeleteLayer(const OUString& rName) } - void SdrEditView::EndUndo() { // #i13033# @@ -661,7 +660,6 @@ void SdrEditView::CheckPossibilities() } - void SdrEditView::ForceMarkedObjToAnotherPage() { bool bFlg=false; @@ -959,7 +957,6 @@ void SdrEditView::CopyMarkedObj() } - bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInsertFlags nOptions) { if (nOptions & SdrInsertFlags::SETDEFLAYER) { @@ -1034,7 +1031,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO } - bool SdrEditView::IsUndoEnabled() const { return mpModel->IsUndoEnabled(); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 961e084b125d..20fa36595097 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -63,11 +63,9 @@ #include <svx/xlnwtit.hxx> - // EditView - void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense."); @@ -704,7 +702,6 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto } - void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bReplaceAll*/) { // bReplaceAll has no effect here @@ -1239,7 +1236,6 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRe } - bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(GetMarkedObjectCount()) @@ -1283,7 +1279,6 @@ bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHard } - SfxItemSet SdrEditView::GetGeoAttrFromMarked() const { SfxItemSet aRetSet(mpModel->GetItemPool(), // SID_ATTR_TRANSFORM_... from s:svxids.hrc @@ -1748,7 +1743,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } - bool SdrEditView::IsAlignPossible() const { // at least two selected objects, at least one of them movable ForcePossibilities(); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 3bbccf99ce58..1685cf88d557 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -103,7 +103,6 @@ SdrObjEditView::~SdrObjEditView() } - bool SdrObjEditView::IsAction() const { return IsMacroObj() || SdrGlueEditView::IsAction(); @@ -1185,7 +1184,6 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const } - OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const { if (pWin==nullptr) return nullptr; @@ -1484,7 +1482,6 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) } - bool SdrObjEditView::ImpIsTextEditAllSelected() const { bool bRet=false; @@ -1793,7 +1790,6 @@ bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveH } - void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWindow) { SdrGlueEditView::AddWindowToPaintView(pNewWin, pWindow); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 1912588117ba..25b8809a6906 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -255,7 +255,6 @@ IMPL_LINK_NOARG_TYPED(OLEObjCache, UnloadCheckHdl, Timer*, void) } - void SdrLinkList::Clear() { aList.clear(); @@ -298,7 +297,6 @@ void SdrLinkList::RemoveLink(const Link<SdrObjFactory*,void>& rLink) } - bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { drawing::FillStyle eFill=static_cast<const XFillStyleItem&>(rSet.Get(XATTR_FILLSTYLE)).GetValue(); @@ -550,7 +548,6 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange } - SvdProgressInfo::SvdProgressInfo( const Link<void*,bool>&_rLink ) { maLink = _rLink; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 04d97c7c59a5..ce8e2d44a0a8 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1115,7 +1115,6 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaBmpExScaleAction& rAct) } - void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) { // #i73407# reformulation to use new B2DPolygon classes @@ -1166,7 +1165,6 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct ) } - void ImpSdrGDIMetaFileImport::DoAction(MetaLineColorAction& rAct) { rAct.Execute(mpVD); @@ -1201,7 +1199,6 @@ void ImpSdrGDIMetaFileImport::MapScaling() } - void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile& rMtf, sal_uLong& a) // GDIMetaFile* pMtf ) { bool aSkipComment = false; diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 3b603b332ce3..12d74a1e7667 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -30,7 +30,6 @@ #include <svx/svdobj.hxx> - SdrGlueEditView::SdrGlueEditView(SdrModel* pModel1, OutputDevice* pOut): SdrPolyEditView(pModel1,pOut) { @@ -41,7 +40,6 @@ SdrGlueEditView::~SdrGlueEditView() } - void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { const size_t nMarkCount=GetMarkedObjectCount(); @@ -85,7 +83,6 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co } - static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); @@ -129,7 +126,6 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, boo } - static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*) { sal_uInt16& nRet=*const_cast<sal_uInt16 *>(static_cast<sal_uInt16 const *>(pnRet)); @@ -166,7 +162,6 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn) } - static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*) { SdrAlign& nRet=*const_cast<SdrAlign *>(static_cast<SdrAlign const *>(pnRet)); @@ -266,7 +261,6 @@ void SdrGlueEditView::DeleteMarkedGluePoints() } - void SdrGlueEditView::ImpCopyMarkedGluePoints() { const bool bUndo = IsUndoEnabled(); @@ -316,7 +310,6 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() } - void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { const size_t nMarkCount=GetMarkedObjectCount(); @@ -352,7 +345,6 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo } - static void ImpMove(Point& rPt, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { rPt.X()+=static_cast<const Size*>(p1)->Width(); @@ -372,7 +364,6 @@ void SdrGlueEditView::MoveMarkedGluePoints(const Size& rSiz, bool bCopy) } - static void ImpResize(Point& rPt, const void* p1, const void* p2, const void* p3, const void* /*p4*/, const void* /*p5*/) { ResizePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const Fraction*>(p2),*static_cast<const Fraction*>(p3)); @@ -391,7 +382,6 @@ void SdrGlueEditView::ResizeMarkedGluePoints(const Point& rRef, const Fraction& } - static void ImpRotate(Point& rPt, const void* p1, const void* /*p2*/, const void* p3, const void* p4, const void* /*p5*/) { RotatePoint(rPt,*static_cast<const Point*>(p1),*static_cast<const double*>(p3),*static_cast<const double*>(p4)); diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 4ec986e7f336..946b26dd7966 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -276,7 +276,6 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO } - void SdrGluePointList::Clear() { sal_uInt16 nCount=GetCount(); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index af2be461da15..1bd09a3d3f5f 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -268,7 +268,6 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal } - SdrHdl::SdrHdl(): pObj(nullptr), pPV(nullptr), @@ -1308,7 +1307,6 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool } - SdrHdlLine::~SdrHdlLine() {} void SdrHdlLine::CreateB2dIAObject() @@ -1364,7 +1362,6 @@ Pointer SdrHdlLine::GetPointer() const } - SdrHdlBezWgt::~SdrHdlBezWgt() {} void SdrHdlBezWgt::CreateB2dIAObject() @@ -1421,7 +1418,6 @@ void SdrHdlBezWgt::CreateB2dIAObject() } - E3dVolumeMarker::E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly) { aWireframePoly = rWireframePoly; @@ -1467,7 +1463,6 @@ void E3dVolumeMarker::CreateB2dIAObject() } - ImpEdgeHdl::~ImpEdgeHdl() { } @@ -1592,7 +1587,6 @@ bool ImpEdgeHdl::IsHorzDrag() const } - ImpMeasureHdl::~ImpMeasureHdl() { } @@ -1668,7 +1662,6 @@ Pointer ImpMeasureHdl::GetPointer() const } - ImpTextframeHdl::ImpTextframeHdl(const Rectangle& rRect) : SdrHdl(rRect.TopLeft(),HDL_MOVE), maRect(rRect) @@ -1729,7 +1722,6 @@ void ImpTextframeHdl::CreateB2dIAObject() } - static bool ImpSdrHdlListSorter(SdrHdl* const& lhs, SdrHdl* const& rhs) { SdrHdlKind eKind1=lhs->GetKind(); @@ -1874,7 +1866,6 @@ extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 } - void SdrHdlList::TravelFocusHdl(bool bForward) { // security correction @@ -2051,7 +2042,6 @@ void SdrHdlList::ResetFocusHdl() } - SdrHdlList::SdrHdlList(SdrMarkView* pV) : mnFocusIndex(SAL_MAX_SIZE), pView(pV), @@ -2247,14 +2237,12 @@ SdrCropHdl::SdrCropHdl( } - BitmapEx SdrCropHdl::GetHandlesBitmap() { return BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); } - BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) { int nPixelSize = 0, nX = 0, nY = 0, nOffset = 0; @@ -2296,7 +2284,6 @@ BitmapEx SdrCropHdl::GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ) } - void SdrCropHdl::CreateB2dIAObject() { // first throw away old one diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index 0204b580e7c7..851016e8cc33 100644 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -26,7 +26,6 @@ #include <vcl/lineinfo.hxx> - Pointer SdrHelpLine::GetPointer() const { switch (eKind) { diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index a17bc051e037..0d16464b8120 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -18,8 +18,6 @@ */ - - #include <svx/svdmark.hxx> #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> @@ -246,7 +244,6 @@ static bool ImpSdrMarkListSorter(SdrMark* const& lhs, SdrMark* const& rhs) } - void SdrMarkList::ForceSort() const { if(!mbSorted) @@ -773,7 +770,6 @@ bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const } - namespace sdr { ViewSelection::ViewSelection() diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 97eb3a4a69e3..2c89cec99046 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -97,7 +97,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - struct SdrModelImpl { SfxUndoManager* mpUndoManager; @@ -105,7 +104,6 @@ struct SdrModelImpl }; - void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper, bool bUseExtColorTable, bool bLoadRefCounts) { @@ -339,7 +337,6 @@ void SdrModel::SetReadOnly(bool bYes) } - void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nCount) { if (nCount<1) nCount=1; @@ -1575,7 +1572,6 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) } - void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, bool bUndo, bool bMoveNoCopy) @@ -1875,7 +1871,6 @@ void SdrModel::setLock( bool bLock ) } - void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSet, SdrModel* pNewModel ) { assert(pNewModel != nullptr); @@ -1932,7 +1927,6 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe } - void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { if( mpForbiddenCharactersTable ) @@ -2116,7 +2110,6 @@ const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() } - SdrHint::SdrHint(SdrHintKind eNewHint) : mpPage(nullptr), mpObj(nullptr), @@ -2148,6 +2141,4 @@ void SdrHint::SetKind(SdrHintKind eNewKind) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 76eb72d27626..85001e06f46a 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -122,11 +122,9 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition } - // MarkView - void SdrMarkView::ImpClearVars() { meDragMode=SDRDRAG_MOVE; @@ -243,7 +241,6 @@ void SdrMarkView::ModelHasChanged() } - bool SdrMarkView::IsAction() const { return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); @@ -314,7 +311,6 @@ void SdrMarkView::TakeActionRect(Rectangle& rRect) const } - void SdrMarkView::ClearPageView() { UnmarkAllObj(); @@ -345,7 +341,6 @@ void SdrMarkView::HideSdrPage() } - bool SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark) { BrkAction(); @@ -404,7 +399,6 @@ void SdrMarkView::BrkMarkObj() } - bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark) { if(HasMarkablePoints()) @@ -470,7 +464,6 @@ void SdrMarkView::BrkMarkPoints() } - bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark) { if(HasMarkableGluePoints()) @@ -1382,7 +1375,6 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) } - bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { if (pObj) @@ -2085,7 +2077,6 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const } - void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, ImpTakeDescriptionOptions nOpt) const { rStr = ImpGetResStr(nStrCacheID); @@ -2142,7 +2133,6 @@ bool SdrMarkView::EnterMarkedGroup() } - void SdrMarkView::MarkListHasChanged() { GetMarkedObjectListWriteAccess().SetNameDirty(); @@ -2165,7 +2155,6 @@ void SdrMarkView::MarkListHasChanged() } - void SdrMarkView::SetMoveOutside(bool bOn) { maHdlList.SetMoveOutside(bOn); diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index beb13620e84d..298a12a1295a 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -374,7 +374,6 @@ void SdrMarkView::UndirtyMrkPnt() const } - bool SdrMarkView::HasMarkableGluePoints() const { bool bRet=false; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 6304c471dd5d..9d322122fd30 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -405,7 +405,6 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS } - Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const { if (mxCustomShapeEngine.is()) @@ -1410,7 +1409,6 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const } - void SdrObjCustomShape::RecalcSnapRect() { SdrTextObj::RecalcSnapRect(); @@ -1728,7 +1726,6 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nAngle, double tn, boo } - SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const { sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# @@ -1756,7 +1753,6 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const } - // #i38892# void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() { @@ -1879,7 +1875,6 @@ SdrGluePointList* SdrObjCustomShape::ForceGluePointList() } - sal_uInt32 SdrObjCustomShape::GetHdlCount() const { const sal_uInt32 nBasicHdlCount(SdrTextObj::GetHdlCount()); @@ -1920,7 +1915,6 @@ SdrHdl* SdrObjCustomShape::GetHdl( sal_uInt32 nHdlNum ) const } - bool SdrObjCustomShape::hasSpecialDrag() const { return true; @@ -2142,7 +2136,6 @@ bool SdrObjCustomShape::applySpecialDrag(SdrDragStat& rDrag) } - void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) { Rectangle aRect1; @@ -2220,7 +2213,6 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r } - // in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text, // the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape bool SdrObjCustomShape::IsAutoGrowHeight() const diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index e6102e9e21b4..ffcb005cb7ca 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -80,8 +80,6 @@ sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties() } - - SdrAttrObj::SdrAttrObj() { } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 3dd1449632a5..4e931a9888d8 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -141,8 +141,6 @@ using namespace ::com::sun::star; - - SdrObjUserCall::~SdrObjUserCall() { } @@ -159,7 +157,6 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() : bDown(false) {} - SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) : nInventor(nInv), nIdentifier(nId), @@ -288,15 +285,12 @@ void SdrObject::ActionChanged() const } - void SdrObject::SetBoundRectDirty() { aOutRect = Rectangle(); } - - SdrObject::SdrObject() : mpImpl(new Impl), mpProperties(nullptr) @@ -831,16 +825,12 @@ sal_uInt32 SdrObject::GetNavigationPosition() } - - void SdrObject::SetNavigationPosition (const sal_uInt32 nNewPosition) { mnNavigationPosition = nNewPosition; } - - // To make clearer that this method may trigger RecalcBoundRect and thus may be // expensive and sometimes problematic (inside a bigger object change you will get // non-useful BoundRects sometimes) I rename that method from GetBoundRect() to @@ -1295,7 +1285,6 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const } - bool SdrObject::hasSpecialDrag() const { return false; @@ -1877,7 +1866,6 @@ bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const } - SdrObjGeoData* SdrObject::NewGeoData() const { return new SdrObjGeoData; @@ -2369,7 +2357,6 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const } - void extractLineContourFromPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DSequence& rxSequence, basegfx::B2DPolygonVector& rExtractedHairlines, @@ -2396,7 +2383,6 @@ void extractLineContourFromPrimitive2DSequence( } - SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) { bool bNoChange(true); @@ -2561,21 +2547,12 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas } - - - - void SdrObject::SetMarkProtect(bool bProt) { bMarkProt = bProt; } - - - - - void SdrObject::SetEmptyPresObj(bool bEpt) { bEmptyPresObj = bEpt; @@ -2588,8 +2565,6 @@ void SdrObject::SetNotVisibleAsMaster(bool bFlg) } - - // convert this path object to contour object, even when it is a group SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const { @@ -2630,7 +2605,6 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) } - SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const { SdrObject* pRet = DoConvertToPolyObj(bBezier, true); @@ -2652,14 +2626,12 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const } - SdrObject* SdrObject::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return nullptr; } - void SdrObject::SetInserted(bool bIns) { if (bIns!=IsInserted()) { @@ -2727,7 +2699,6 @@ void SdrObject::SetVisible(bool bVisible) } - sal_uInt16 SdrObject::GetUserDataCount() const { if (pPlusData==nullptr || pPlusData->pUserDataList==nullptr) return 0; @@ -2973,7 +2944,6 @@ void SdrObject::notifyShapePropertyChange( const svx::ShapeProperty _eProperty ) } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index fc3b0f03ebd1..238fe2a81465 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -61,7 +61,6 @@ #include <svx/xpool.hxx> - enum EscDir {LKS,RTS,OBN,UNT}; class ImpCaptParams @@ -192,8 +191,6 @@ sdr::contact::ViewContact* SdrCaptionObj::CreateObjectSpecificViewContact() } - - SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), aTailPoly(3), // default size: 3 points = 2 lines @@ -307,7 +304,6 @@ SdrHdl* SdrCaptionObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrCaptionObj::hasSpecialDrag() const { return true; @@ -419,7 +415,6 @@ OUString SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - void SdrCaptionObj::ImpGetCaptParams(ImpCaptParams& rPara) const { const SfxItemSet& rSet = GetObjectItemSet(); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 0ceaab15c04c..f273a4ef4df5 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -105,8 +105,6 @@ sdr::contact::ViewContact* SdrCircObj::CreateObjectSpecificViewContact() } - - SdrCircObj::SdrCircObj(SdrObjKind eNewKind) { nStartAngle=0; @@ -467,7 +465,6 @@ SdrHdl* SdrCircObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrCircObj::hasSpecialDrag() const { return true; @@ -613,7 +610,6 @@ OUString SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - void ImpCircUser::SetCreateParams(SdrDragStat& rStat) { rStat.TakeCreateRect(aR); @@ -1065,7 +1061,6 @@ void SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } - void SdrCircObj::ImpSetAttrToCircInfo() { const SfxItemSet& rSet = GetObjectItemSet(); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 8e7749a1b3fe..b5d0c0e5e03d 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -49,7 +49,6 @@ #include <svx/xpool.hxx> - SdrObjConnection::~SdrObjConnection() { } @@ -164,7 +163,6 @@ sdr::contact::ViewContact* SdrEdgeObj::CreateObjectSpecificViewContact() } - SdrEdgeObj::SdrEdgeObj() : SdrTextObj(), nNotifyingCount(0), @@ -1809,7 +1807,6 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrEdgeObj::hasSpecialDrag() const { return true; @@ -1960,7 +1957,6 @@ OUString SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMethod, bool bTail1, bool bTail2, bool bDetail) const { basegfx::B2DPolygon aResult; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9c37084504fa..bcc4769f92e2 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -640,7 +640,6 @@ bool SdrGrafObj::IsLinkedGraphic() const } - void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 7cbaf43f1dce..4bbd9b518377 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -67,8 +67,6 @@ sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact() } - - SdrObjGroup::SdrObjGroup() { pSub=new SdrObjList(nullptr,nullptr); @@ -714,7 +712,6 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt) } - void SdrObjGroup::NbcSetRelativePos(const Point& rPnt) { Point aRelPos0(GetSnapRect().TopLeft()-aAnchor); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 3dc86c494113..23fa3aef6b93 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -72,7 +72,6 @@ #include <unotools/syslocale.hxx> - SdrMeasureObjGeoData::SdrMeasureObjGeoData() {} SdrMeasureObjGeoData::~SdrMeasureObjGeoData() {} @@ -210,8 +209,6 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() } - - SdrMeasureObj::SdrMeasureObj(): bTextDirty(false) { @@ -797,7 +794,6 @@ SdrHdl* SdrMeasureObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrMeasureObj::hasSpecialDrag() const { return true; @@ -968,7 +964,6 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c } - bool SdrMeasureObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho8Possible(); diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 939ac77b4abe..3825a1dcc600 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -78,8 +78,6 @@ struct SdrMediaObj::Impl }; - - SdrMediaObj::SdrMediaObj() : SdrRectObj() , m_xImpl( new Impl() ) diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index e786dbfb56e3..49fdf63c58c3 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -589,7 +589,6 @@ void SdrLightEmbeddedClient_Impl::setWindow(const uno::Reference< awt::XWindow > } - class SdrEmbedObjectLink : public sfx2::SvBaseLink { SdrOle2Obj* pObj; @@ -606,7 +605,6 @@ public: }; - SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SVXB ), pObj(pObject) @@ -615,13 +613,11 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): } - SdrEmbedObjectLink::~SdrEmbedObjectLink() { } - ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged( const OUString& /*rMimeType*/, const css::uno::Any & /*rValue*/ ) { @@ -658,7 +654,6 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() } - void SdrEmbedObjectLink::Closed() { pObj->BreakFileLink_Impl(); @@ -666,7 +661,6 @@ void SdrEmbedObjectLink::Closed() } - class SdrOle2ObjImpl { public: @@ -741,7 +735,6 @@ public: }; - // Predicate determining whether the given OLE is an internal math // object static bool ImplIsMathObj( const uno::Reference < embed::XEmbeddedObject >& rObjRef ) @@ -781,8 +774,6 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() } - - SdrOle2Obj::SdrOle2Obj( bool bFrame_ ) : mpImpl(new SdrOle2ObjImpl(bFrame_)) { @@ -812,7 +803,6 @@ OUString SdrOle2Obj::GetStyleString() } - SdrOle2Obj::~SdrOle2Obj() { mpImpl->mbInDestruction = true; @@ -899,7 +889,6 @@ bool SdrOle2Obj::IsEmpty() const } - void SdrOle2Obj::Connect() { if( IsEmptyPresObj() ) @@ -918,7 +907,6 @@ void SdrOle2Obj::Connect() } - bool SdrOle2Obj::UpdateLinkURL_Impl() { bool bResult = false; @@ -978,7 +966,6 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() } - void SdrOle2Obj::BreakFileLink_Impl() { uno::Reference<document::XStorageBasedDocument> xDoc; @@ -1011,7 +998,6 @@ void SdrOle2Obj::BreakFileLink_Impl() } - void SdrOle2Obj::DisconnectFileLink_Impl() { sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : nullptr; @@ -1023,7 +1009,6 @@ void SdrOle2Obj::DisconnectFileLink_Impl() } - void SdrOle2Obj::CheckFileLink_Impl() { if (pModel && mpImpl->mxObjRef.GetObject().is() && !mpImpl->mpObjectLink) @@ -1061,7 +1046,6 @@ void SdrOle2Obj::CheckFileLink_Impl() } - void SdrOle2Obj::Reconnect_Impl() { DBG_ASSERT( mpImpl->mbConnected, "Assigned unconnected object?!" ); @@ -1186,7 +1170,6 @@ void SdrOle2Obj::AddListeners_Impl() } - void SdrOle2Obj::Disconnect() { if( IsEmptyPresObj() ) @@ -1315,7 +1298,6 @@ void SdrOle2Obj::Disconnect_Impl() } - SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHCGraphic */) const { const Graphic* pOLEGraphic = GetGraphic(); @@ -1393,7 +1375,6 @@ SdrObject* SdrOle2Obj::DoConvertToPolyObj(bool bBezier, bool bAddText) const } - void SdrOle2Obj::SetModel(SdrModel* pNewModel) { ::comphelper::IEmbeddedHelper* pDestPers = pNewModel ? pNewModel->GetPersist() : nullptr; @@ -1469,7 +1450,6 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) } - void SdrOle2Obj::SetPage(SdrPage* pNewPage) { bool bRemove=pNewPage==nullptr && pPage!=nullptr; @@ -1505,7 +1485,6 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage) } - void SdrOle2Obj::SetObjRef( const css::uno::Reference < css::embed::XEmbeddedObject >& rNewObjRef ) { DBG_ASSERT( !rNewObjRef.is() || !mpImpl->mxObjRef.GetObject().is(), "SetObjRef called on already initialized object!"); @@ -1545,7 +1524,6 @@ void SdrOle2Obj::SetObjRef( const css::uno::Reference < css::embed::XEmbeddedObj } - void SdrOle2Obj::SetClosedObj( bool bIsClosed ) { // TODO/LATER: do we still need this hack? @@ -1554,7 +1532,6 @@ void SdrOle2Obj::SetClosedObj( bool bIsClosed ) } - SdrObject* SdrOle2Obj::getFullDragClone() const { // #i118485# use central replacement generator @@ -1562,7 +1539,6 @@ SdrObject* SdrOle2Obj::getFullDragClone() const } - void SdrOle2Obj::SetPersistName( const OUString& rPersistName ) { DBG_ASSERT( mpImpl->aPersistName.isEmpty(), "Persist name changed!"); @@ -1582,14 +1558,12 @@ void SdrOle2Obj::AbandonObject() } - OUString SdrOle2Obj::GetPersistName() const { return mpImpl->aPersistName; } - void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { // #i118485# Allowing much more attributes for OLEs @@ -1611,14 +1585,12 @@ void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const } - sal_uInt16 SdrOle2Obj::GetObjIdentifier() const { return mpImpl->mbFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2); } - OUString SdrOle2Obj::TakeObjNameSingul() const { OUStringBuffer sName(ImpGetResStr(mpImpl->mbFrame ? STR_ObjNameSingulFrame : STR_ObjNameSingulOLE2)); @@ -1636,7 +1608,6 @@ OUString SdrOle2Obj::TakeObjNameSingul() const } - OUString SdrOle2Obj::TakeObjNamePlural() const { return ImpGetResStr(mpImpl->mbFrame ? STR_ObjNamePluralFrame : STR_ObjNamePluralOLE2); @@ -1861,7 +1832,6 @@ void SdrOle2Obj::ImpSetVisAreaSize() } - void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { if( pModel && !pModel->isLocked() ) @@ -1882,7 +1852,6 @@ void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract } - void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) { SdrRectObj::SetGeoData(rGeo); @@ -1892,7 +1861,6 @@ void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo) } - void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) { SdrRectObj::NbcSetSnapRect(rRect); @@ -1910,7 +1878,6 @@ void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect) } - void SdrOle2Obj::NbcSetLogicRect(const Rectangle& rRect) { SdrRectObj::NbcSetLogicRect(rRect); @@ -1933,7 +1900,6 @@ void SdrOle2Obj::GetNewReplacement() } - Size SdrOle2Obj::GetOrigObjSize( MapMode* pTargetMapMode ) const { return mpImpl->mxObjRef.GetSize( pTargetMapMode ); @@ -1953,7 +1919,6 @@ void SdrOle2Obj::NbcMove(const Size& rSize) } - bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { uno::Reference<embed::XEmbedPersist2> xPersist(xObj, uno::UNO_QUERY); @@ -1995,7 +1960,6 @@ bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObje } - bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { bool bResult = false; @@ -2022,7 +1986,6 @@ bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, s } - bool SdrOle2Obj::Unload() { if (!mpImpl->mxObjRef.is()) @@ -2039,7 +2002,6 @@ bool SdrOle2Obj::Unload() } - void SdrOle2Obj::GetObjRef_Impl() { if ( !mpImpl->mxObjRef.is() && !mpImpl->aPersistName.isEmpty() && pModel && pModel->GetPersist() ) @@ -2131,7 +2093,6 @@ uno::Reference < embed::XEmbeddedObject > SdrOle2Obj::GetObjRef_NoInit() const } - uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const { GetObjRef(); @@ -2142,7 +2103,6 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const } - bool SdrOle2Obj::IsChart() const { if (!mpImpl->mbTypeAsked) @@ -2262,14 +2222,12 @@ bool SdrOle2Obj::AddOwnLightClient() } - Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic() { return Graphic(BitmapEx(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr()))); } - void SdrOle2Obj::SetWindow(const css::uno::Reference < css::awt::XWindow >& _xWindow) { if ( mpImpl->mxObjRef.is() && mpImpl->pLightClient ) diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 1b3f0edc36e0..02f2dfcbceaf 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -65,8 +65,6 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage) } - - SdrPageObj::SdrPageObj(SdrPage* pNewPage) : mpShownPage(pNewPage) { diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 42a0edba9ca1..0a0ee30862af 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2856,7 +2856,6 @@ void SdrPathObj::impDeleteDAC() const } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 56a491229705..b1692206c6b5 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -62,8 +62,6 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact() } - - SdrRectObj::SdrRectObj() : mpXPoly(nullptr) { @@ -382,7 +380,6 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrRectObj::hasSpecialDrag() const { return true; @@ -473,7 +470,6 @@ OUString SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - basegfx::B2DPolyPolygon SdrRectObj::TakeCreatePoly(const SdrDragStat& rDrag) const { Rectangle aRect1; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 0159d382326a..49e11c898918 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -81,8 +81,6 @@ sdr::contact::ViewContact* SdrTextObj::CreateObjectSpecificViewContact() } - - SdrTextObj::SdrTextObj() : SdrAttrObj(), mpText(nullptr), @@ -1398,7 +1396,6 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint } - OutlinerParaObject* SdrTextObj::GetOutlinerParaObject() const { SdrText* pText = getActiveText(); @@ -1636,7 +1633,6 @@ void SdrTextObj::SetVerticalWriting(bool bVertical) } - // transformation interface for StarOfficeAPI. This implements support for // homogeneous 3x3 matrices containing the transformation of the SdrObject. At the // moment it contains a shearX, rotation and translation, but for setting all linear @@ -2209,7 +2205,6 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) } - // The concept of the text object: // ~~~~~~~~~~~~~~~~~~~~~~~~ // Attributes/Variations: @@ -2273,5 +2268,4 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // - and many more... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 78fc7e796708..a3be649f56d3 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -58,7 +58,6 @@ #include <sdr/attribute/sdrformtextoutlineattribute.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::i18n; diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 004453006a86..a813da95de73 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -63,7 +63,6 @@ SdrHdl* SdrTextObj::GetHdl(sal_uInt32 nHdlNum) const } - bool SdrTextObj::hasSpecialDrag() const { return true; diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 79dfcf938fe9..ce118bc49f8e 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -284,7 +284,6 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) } - SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const { SdrObject* pRetval = nullptr; @@ -407,7 +406,6 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const } - SdrObject* SdrTextObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { if(bAddText) diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 1f2b33e909f0..319d5599240f 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -57,7 +57,6 @@ using namespace sdr::contact; // Defines - // Helper class SdrControlEventListenerImpl #include <com/sun/star/lang/XEventListener.hpp> @@ -335,7 +334,6 @@ void SdrUnoObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti } - bool SdrUnoObj::hasSpecialDrag() const { // no special drag; we have no rounding rect and diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 9c16a472a3f8..587363daf1dc 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -30,7 +30,6 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> - sdr::properties::BaseProperties& SdrVirtObj::GetProperties() const { return rRefObj.GetProperties(); @@ -44,8 +43,6 @@ sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact() } - - SdrVirtObj::SdrVirtObj(SdrObject& rNewObj): rRefObj(rNewObj) { @@ -60,7 +57,6 @@ SdrVirtObj::~SdrVirtObj() } - const SdrObject& SdrVirtObj::GetReferencedObj() const { return rRefObj; @@ -86,7 +82,6 @@ void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos) } - void SdrVirtObj::SetModel(SdrModel* pNewModel) { SdrObject::SetModel(pNewModel); @@ -189,7 +184,6 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeXorPoly() const } - sal_uInt32 SdrVirtObj::GetHdlCount() const { return rRefObj.GetHdlCount(); @@ -259,7 +253,6 @@ void SdrVirtObj::AddToHdlList(SdrHdlList& rHdlList) const } - bool SdrVirtObj::hasSpecialDrag() const { return rRefObj.hasSpecialDrag(); @@ -314,7 +307,6 @@ OUString SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const } - bool SdrVirtObj::BegCreate(SdrDragStat& rStat) { return rRefObj.BegCreate(rStat); @@ -347,7 +339,6 @@ basegfx::B2DPolyPolygon SdrVirtObj::TakeCreatePoly(const SdrDragStat& rDrag) con } - void SdrVirtObj::NbcMove(const Size& rSiz) { MovePoint(aAnchor,rSiz); @@ -379,7 +370,6 @@ void SdrVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea } - void SdrVirtObj::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { @@ -430,7 +420,6 @@ void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) } - void SdrVirtObj::RecalcSnapRect() { aSnapRect=rRefObj.GetSnapRect(); @@ -465,7 +454,6 @@ void SdrVirtObj::NbcSetSnapRect(const Rectangle& rRect) } - const Rectangle& SdrVirtObj::GetLogicRect() const { const_cast<SdrVirtObj*>(this)->aSnapRect=rRefObj.GetLogicRect(); // An abuse of aSnapRect! @@ -492,7 +480,6 @@ void SdrVirtObj::NbcSetLogicRect(const Rectangle& rRect) } - long SdrVirtObj::GetRotateAngle() const { return rRefObj.GetRotateAngle(); @@ -504,7 +491,6 @@ long SdrVirtObj::GetShearAngle(bool bVertical) const } - sal_uInt32 SdrVirtObj::GetSnapPointCount() const { return rRefObj.GetSnapPointCount(); @@ -541,7 +527,6 @@ void SdrVirtObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) } - SdrObjGeoData* SdrVirtObj::NewGeoData() const { return rRefObj.NewGeoData(); @@ -559,7 +544,6 @@ void SdrVirtObj::RestGeoData(const SdrObjGeoData& rGeo) } - SdrObjGeoData* SdrVirtObj::GetGeoData() const { return rRefObj.GetGeoData(); @@ -574,7 +558,6 @@ void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo) } - void SdrVirtObj::NbcReformatText() { rRefObj.NbcReformatText(); @@ -586,7 +569,6 @@ void SdrVirtObj::ReformatText() } - bool SdrVirtObj::HasMacro() const { return rRefObj.HasMacro(); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 432648dc6a59..4406cd79b69a 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -68,7 +68,6 @@ public: }; - static const sal_Int32 InitialObjectContainerCapacity (64); @@ -679,8 +678,6 @@ size_t SdrObjList::GetObjCount() const } - - SdrObject* SdrObjList::GetObj(size_t nNum) const { if (nNum >= maList.size()) @@ -693,8 +690,6 @@ SdrObject* SdrObjList::GetObj(size_t nNum) const } - - bool SdrObjList::IsReadOnly() const { bool bRet = false; @@ -760,16 +755,12 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) } - - bool SdrObjList::HasObjectNavigationOrder() const { return mxNavigationOrder.get() != nullptr; } - - void SdrObjList::SetObjectNavigationPosition ( SdrObject& rObject, const sal_uInt32 nNewPosition) @@ -824,8 +815,6 @@ void SdrObjList::SetObjectNavigationPosition ( } - - SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigationPosition) const { if (HasObjectNavigationOrder()) @@ -854,8 +843,6 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat } - - void SdrObjList::ClearObjectNavigationOrder() { mxNavigationOrder.reset(); @@ -863,8 +850,6 @@ void SdrObjList::ClearObjectNavigationOrder() } - - bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) @@ -885,8 +870,6 @@ bool SdrObjList::RecalcNavigationPositions() } - - void SdrObjList::SetNavigationOrder (const uno::Reference<container::XIndexAccess>& rxOrder) { if (rxOrder.is()) @@ -914,8 +897,6 @@ void SdrObjList::SetNavigationOrder (const uno::Reference<container::XIndexAcces } - - void SdrObjList::InsertObjectIntoContainer ( SdrObject& rObject, const sal_uInt32 nInsertPosition) @@ -942,8 +923,6 @@ void SdrObjList::InsertObjectIntoContainer ( } - - void SdrObjList::ReplaceObjectInContainer ( SdrObject& rNewObject, const sal_uInt32 nObjectPosition) @@ -979,8 +958,6 @@ void SdrObjList::ReplaceObjectInContainer ( } - - void SdrObjList::RemoveObjectFromContainer ( const sal_uInt32 nObjectPosition) { @@ -1024,9 +1001,6 @@ void SdrObjList::dumpAsXml(xmlTextWriterPtr pWriter) const } - - - void SdrPageGridFrameList::Clear() { sal_uInt16 nCount=GetCount(); @@ -1192,8 +1166,6 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) } - - SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) : SdrObjList(&rNewModel, this), mpViewContact(nullptr), @@ -1550,7 +1522,6 @@ void SdrPage::SetModel(SdrModel* pNewModel) } - // #i68775# React on PageNum changes (from Model in most cases) void SdrPage::SetPageNum(sal_uInt16 nNew) { diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 4d38c950c858..fe3c045b9445 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -135,7 +135,6 @@ SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) } - SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) : mrView(rNewView), // col_auto color lets the view takes the default SvxColorConfig entry @@ -267,7 +266,6 @@ void SdrPageView::InvalidateAllWin() } - void SdrPageView::PrePaint() { const sal_uInt32 nCount(PageWindowCount()); @@ -418,7 +416,6 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const } - void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) { if (GetPage()==nullptr) @@ -961,5 +958,4 @@ void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 34cc2e0f8d8a..382455f8e153 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -119,16 +119,12 @@ OutputDevice* SdrPaintView::GetFirstOutputDevice() const } - SvxViewHint::SvxViewHint (HintType eHintType) : meHintType(eHintType) { } - - - BitmapEx convertMetafileToBitmapEx( const GDIMetaFile& rMtf, const basegfx::B2DRange& rTargetRange, @@ -154,9 +150,6 @@ BitmapEx convertMetafileToBitmapEx( } - - - void SdrPaintView::ImpClearVars() { #ifdef DBG_UTIL @@ -247,7 +240,6 @@ SdrPaintView::~SdrPaintView() } - void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { //If the stylesheet has been destroyed @@ -333,7 +325,6 @@ void SdrPaintView::ModelHasChanged() } - bool SdrPaintView::IsAction() const { return false; @@ -373,7 +364,6 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const } - sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const { if (nMinMov>=0) return sal_uInt16(nMinMov); @@ -417,7 +407,6 @@ void SdrPaintView::SetActualWin(const OutputDevice* pWin) } - void SdrPaintView::ClearPageView() { BrkAction(); @@ -769,7 +758,6 @@ void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFo } - SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect) { // #i74769# use BeginCompleteRedraw() as common base @@ -853,7 +841,6 @@ vcl::Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl } - void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow ) { if(mpPageView) @@ -876,7 +863,6 @@ void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow ) } - bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/) { return false; @@ -1117,7 +1103,6 @@ bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHar } - #ifdef DBG_UTIL void SdrPaintView::ShowItemBrowser(bool bShow) { diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index da20cab33767..e6d42a81daa6 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -36,7 +36,6 @@ using namespace sdr; - void SdrPolyEditView::ImpResetPolyPossibilityFlags() { eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE; @@ -612,7 +611,6 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* } - static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void* /*p2*/, const void* /*p3*/, const void* /*p4*/, const void* /*p5*/) { MovePoint(rPt,*static_cast<const Size*>(p1)); diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 3d00bf91e14a..c58001ba2cc8 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -208,7 +208,6 @@ SdrSnapView::~SdrSnapView() } - bool SdrSnapView::IsAction() const { return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction(); @@ -260,7 +259,6 @@ void SdrSnapView::TakeActionRect(Rectangle& rRect) const } - Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const { Point aPt(rPnt); @@ -504,7 +502,6 @@ void SdrSnapView::BrkSetPageOrg() } - bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { rpPV=nullptr; diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index c25d34ceed05..53b5685ea593 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -285,7 +285,6 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen } - void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; @@ -356,7 +355,6 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, } - void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { sal_uInt16 nPolyCount=rPoly.Count(); @@ -382,7 +380,6 @@ void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rR } - long GetAngle(const Point& rPnt) { long a=0; @@ -447,7 +444,6 @@ long GetLen(const Point& rPnt) } - void GeoStat::RecalcSinCos() { if (nRotationAngle==0) { @@ -471,7 +467,6 @@ void GeoStat::RecalcTan() } - tools::Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo) { tools::Polygon aPol(5); @@ -527,7 +522,6 @@ void Poly2Rect(const tools::Polygon& rPol, Rectangle& rRect, GeoStat& rGeo) } - void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho) { long dx=rPt.X()-rPt0.X(); @@ -558,7 +552,6 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho) } - long BigMulDiv(long nVal, long nMul, long nDiv) { BigInt aVal(nVal); @@ -660,7 +653,6 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) }; - // 1 mile = 8 furlong = 63.360" = 1.609.344,0mm // 1 furlong = 10 chains = 7.920" = 201.168,0mm // 1 chain = 4 poles = 792" = 20.116,8mm @@ -1050,6 +1042,4 @@ void SdrFormatter::TakeUnitStr(FieldUnit eUnit, OUString& rStr) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index f51942dd302c..24d3e0305254 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -58,8 +58,6 @@ static void ImplUnmarkObject( SdrObject* pObj ) } - - SdrUndoAction::~SdrUndoAction() {} bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const @@ -98,7 +96,6 @@ OUString SdrUndoAction::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod) : SdrUndoAction(rNewMod), aBuf(), @@ -555,7 +552,6 @@ OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoMoveObj::~SdrUndoMoveObj() {} void SdrUndoMoveObj::Undo() @@ -599,7 +595,6 @@ OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) : SdrUndoObj(rNewObj) , pUndoGeo(nullptr) @@ -686,7 +681,6 @@ OUString SdrUndoGeoObj::GetComment() const } - SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) : SdrUndoObj(rNewObj) , bOwner(false) @@ -771,7 +765,6 @@ SdrUndoRemoveObj::~SdrUndoRemoveObj() } - void SdrUndoInsertObj::Undo() { // Trigger PageChangeCall @@ -860,7 +853,6 @@ OUString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const } - void SdrUndoNewObj::Undo() { SdrUndoInsertObj::Undo(); @@ -980,7 +972,6 @@ void SdrUndoReplaceObj::SetOldOwner(bool bNew) } - OUString SdrUndoCopyObj::GetComment() const { OUString aStr; @@ -1011,7 +1002,6 @@ void SdrUndoObjectLayerChange::Redo() } - SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) : SdrUndoObj(rNewObj) , nOldOrdNum(nOldOrdNum1) @@ -1055,7 +1045,6 @@ OUString SdrUndoObjOrdNum::GetComment() const } - SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) , pOldText(nullptr) @@ -1314,7 +1303,6 @@ SdrUndoLayer::~SdrUndoLayer() } - void SdrUndoNewLayer::Undo() { DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer already belongs to UndoAction."); @@ -1336,7 +1324,6 @@ OUString SdrUndoNewLayer::GetComment() const } - void SdrUndoDelLayer::Undo() { DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer does not belong to UndoAction."); @@ -1358,7 +1345,6 @@ OUString SdrUndoDelLayer::GetComment() const } - void SdrUndoMoveLayer::Undo() { SdrLayer* pCmpLayer= pLayerAdmin->RemoveLayer(nNeuPos); @@ -1442,7 +1428,6 @@ void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, } - SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg) : SdrUndoPage(rNewPg) , bItsMine(false) @@ -1459,7 +1444,6 @@ SdrUndoPageList::~SdrUndoPageList() } - SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg) : SdrUndoPageList(rNewPg) , pUndoGroup(nullptr) @@ -1610,7 +1594,6 @@ void SdrUndoDelPage::restoreFillBitmap() } - void SdrUndoNewPage::Undo() { ImpRemovePage(nPageNum); @@ -1633,7 +1616,6 @@ OUString SdrUndoNewPage::GetComment() const } - OUString SdrUndoCopyPage::GetComment() const { OUString aStr; @@ -1659,7 +1641,6 @@ bool SdrUndoCopyPage::CanSdrRepeat(SdrView& /*rView*/) const } - void SdrUndoSetPageNum::Undo() { ImpMovePage(nNewPageNum,nOldPageNum); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 3c20ccaabf5b..e1dbaa3a30d5 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -51,7 +51,6 @@ #include <drawinglayer/processor2d/contourextractor2d.hxx> - SdrViewEvent::SdrViewEvent() : pHdl(nullptr), pObj(nullptr), @@ -152,7 +151,6 @@ SdrDropMarkerOverlay::~SdrDropMarkerOverlay() } - SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) : SdrCreateView(pModel1,pOut), bNoExtendedMouseDispatcher(false), diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index 3cdfc2c1b57f..a34a9e510689 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -28,7 +28,6 @@ #include <svx/sdrpaintwindow.hxx> - void SdrViewIter::ImpInitVars() { mnListenerNum = 0L; @@ -38,7 +37,6 @@ void SdrViewIter::ImpInitVars() } - SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) { mpPage = pPage; @@ -49,7 +47,6 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) } - SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) { mpObject = pObject; @@ -67,7 +64,6 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) } - bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const { if(!mpPage) @@ -167,7 +163,6 @@ SdrView* SdrViewIter::ImpFindView() } - SdrView* SdrViewIter::FirstView() { ImpInitVars(); @@ -175,7 +170,6 @@ SdrView* SdrViewIter::FirstView() } - SdrView* SdrViewIter::NextView() { mnListenerNum++; diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index ab6c8a4c8d2b..83586cc7f828 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -525,7 +525,6 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const } - GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) const { GDIMetaFile aMtf; @@ -587,7 +586,6 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) co } - Graphic SdrExchangeView::GetAllMarkedGraphic() const { Graphic aRet; @@ -604,7 +602,6 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const } - Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* pObj ) { Graphic aRet; @@ -672,7 +669,6 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* } - ::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const { SortMarkedObjects(); @@ -710,7 +706,6 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* } - void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const { ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects()); @@ -726,7 +721,6 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const } - SdrModel* SdrExchangeView::GetMarkedObjModel() const { // Sorting the MarkList here might be problematic in the future, so @@ -779,7 +773,6 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const } - bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::Cut: Not supported any more." ); @@ -787,7 +780,6 @@ bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) } - bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Yank: Not supported any more." ); @@ -795,7 +787,6 @@ bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) } - bool SdrExchangeView::Paste(vcl::Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported any more." ); diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx index 23bd8f54a0a3..798720563f9a 100644 --- a/svx/source/svdraw/textchaincursor.cxx +++ b/svx/source/svdraw/textchaincursor.cxx @@ -164,7 +164,6 @@ void TextChainCursorManager::HandleCursorEvent( SdrTextObj *pPrevLink = mpTextObj->GetPrevLinkInChain(); - switch ( aCurEvt ) { case CursorChainingEvent::UNCHANGED: // Set same selection as before the chaining (which is saved as PostChainingSel) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 5b972a8f2c3a..9064a3f3edee 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -58,14 +58,12 @@ AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::X } - AccessibleCell::~AccessibleCell() { DBG_ASSERT( mpText == nullptr, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); } - void AccessibleCell::Init() { SdrView* pView = maShapeTreeInfo.GetSdrView(); @@ -94,7 +92,6 @@ void AccessibleCell::Init() } - bool AccessibleCell::SetState (sal_Int16 aState) { bool bStateHasChanged = false; @@ -114,7 +111,6 @@ bool AccessibleCell::SetState (sal_Int16 aState) } - bool AccessibleCell::ResetState (sal_Int16 aState) { bool bStateHasChanged = false; @@ -150,14 +146,12 @@ Any SAL_CALL AccessibleCell::queryInterface( const Type& aType ) throw (RuntimeE } - void SAL_CALL AccessibleCell::acquire( ) throw () { AccessibleCellBase::acquire(); } - void SAL_CALL AccessibleCell::release( ) throw () { AccessibleCellBase::release(); @@ -177,7 +171,6 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::Ru } - /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ @@ -191,7 +184,6 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI } - /** Return a copy of the state set. Possible states are: ENABLED @@ -312,7 +304,6 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const c } - css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -359,7 +350,6 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, } - css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -368,7 +358,6 @@ css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, } - css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) { ThrowIfDisposed (); @@ -393,7 +382,6 @@ css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeExce } - awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -402,28 +390,24 @@ awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::excep } - void SAL_CALL AccessibleCell::addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& xListener) throw (css::uno::RuntimeException) { AccessibleComponentBase::addFocusListener( xListener ); } - void SAL_CALL AccessibleCell::removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) { AccessibleComponentBase::removeFocusListener( xListener ); } - void SAL_CALL AccessibleCell::grabFocus() throw (css::uno::RuntimeException, std::exception) { AccessibleComponentBase::grabFocus(); } - sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -434,7 +418,6 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std: } - sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -455,14 +438,12 @@ css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont() throw } - OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (css::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getTitledBorderText(); } - OUString SAL_CALL AccessibleCell::getToolTipText() throw (css::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getToolTipText(); @@ -491,7 +472,6 @@ void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAcces } - void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -510,7 +490,6 @@ OUString SAL_CALL AccessibleCell::getImplementationName() throw (RuntimeExceptio } - Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (RuntimeException, std::exception) { ThrowIfDisposed (); diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index ce4396987f50..4a43e724c439 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -88,7 +88,6 @@ public: }; - AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo ) : mrShapeTreeInfo( rShapeTreeInfo ) , mRowCount(0) @@ -97,7 +96,6 @@ AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rSh } - void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, const Reference< XTable >& xTable ) { mxAccessible = xAccessible; @@ -118,7 +116,6 @@ void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, } - void AccessibleTableShapeImpl::dispose() { if( mxTable.is() ) @@ -180,7 +177,6 @@ Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32 } - void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException ) { rnRow = 0; @@ -310,13 +306,11 @@ AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInf } - AccessibleTableShape::~AccessibleTableShape() { } - void AccessibleTableShape::Init() { try @@ -335,7 +329,6 @@ void AccessibleTableShape::Init() } - SvxTableController* AccessibleTableShape::getTableController() { SdrView* pView = maShapeTreeInfo.GetSdrView (); @@ -363,14 +356,12 @@ Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (Ru } - void SAL_CALL AccessibleTableShape::acquire( ) throw () { AccessibleTableShape_Base::acquire(); } - void SAL_CALL AccessibleTableShape::release( ) throw () { AccessibleTableShape_Base::release(); @@ -392,14 +383,12 @@ OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeEx } - OUString AccessibleTableShape::CreateAccessibleBaseName() throw (RuntimeException) { return OUString("TableShape"); } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -422,14 +411,12 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessible } - sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::TABLE; } - void SAL_CALL AccessibleTableShape::disposing() { mxImpl->dispose(); @@ -449,7 +436,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeE } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -457,7 +443,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount( ) throw (Run } - OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { checkCellPosition( 0, nRow ); @@ -465,7 +450,6 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 n } - OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -474,7 +458,6 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3 } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -489,7 +472,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -504,7 +486,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 } - Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders( ) throw (RuntimeException, std::exception) { Reference< XAccessibleTable > xRet; @@ -521,7 +502,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea } - Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders( ) throw (RuntimeException, std::exception) { Reference< XAccessibleTable > xRet; @@ -538,7 +518,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn } - Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( ) throw (RuntimeException, std::exception) { sal_Int32 nRow = getAccessibleRowCount(); @@ -575,7 +554,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows( } - Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns( ) throw (RuntimeException, std::exception) { sal_Int32 nColumn = getAccessibleColumnCount(); @@ -612,7 +590,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -626,7 +603,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -640,7 +616,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -654,7 +629,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) throw (RuntimeException, std::exception) { Reference< XAccessible > xRet; @@ -662,7 +636,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption( ) } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) throw (RuntimeException, std::exception) { Reference< XAccessible > xRet; @@ -670,7 +643,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary( ) } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -689,7 +661,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -698,7 +669,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -708,7 +678,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex } - sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -746,7 +715,6 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex } - sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -757,7 +725,6 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh } - void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -779,7 +746,6 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim } - sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -799,7 +765,6 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw } - Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -821,7 +786,6 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi } - void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index c783cb1fb7d6..5279d7b0cadc 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -54,7 +54,6 @@ #include <svx/svdpool.hxx> - using ::editeng::SvxBorderLine; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -66,7 +65,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::container; - static const SvxItemPropertySet* ImplGetSvxCellPropertySet() { // Propertymap fuer einen Outliner Text @@ -359,7 +357,6 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* } - Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException) : SdrText( rTableObj, pOutlinerParaObject ) , SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() ) @@ -378,14 +375,12 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th } - Cell::~Cell() throw() { dispose(); } - void Cell::dispose() { if( mxTable.is() ) @@ -411,7 +406,6 @@ void Cell::dispose() } - void Cell::SetModel(SdrModel* pNewModel) { SvxTextEditSource* pTextEditSource = dynamic_cast< SvxTextEditSource* >( GetEditSource() ); @@ -442,7 +436,6 @@ void Cell::SetModel(SdrModel* pNewModel) } - void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) { if ((mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || mbMerged) @@ -455,7 +448,6 @@ void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) } - void Cell::mergeContent( const CellRef& xSourceCell ) { SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -484,7 +476,6 @@ void Cell::mergeContent( const CellRef& xSourceCell ) } - void Cell::cloneFrom( const CellRef& xCell ) { if( xCell.is() ) @@ -523,7 +514,6 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell ) } - void Cell::setMerged() { if( !mbMerged ) @@ -534,7 +524,6 @@ void Cell::setMerged() } - void Cell::copyFormatFrom( const CellRef& xSourceCell ) { if( xSourceCell.is() && mpProperties ) @@ -554,7 +543,6 @@ void Cell::copyFormatFrom( const CellRef& xSourceCell ) } - void Cell::notifyModified() { if( mxTable.is() ) @@ -582,7 +570,6 @@ bool Cell::IsTextEditActive() } - bool Cell::hasText() const { OutlinerParaObject* pParaObj = GetOutlinerParaObject(); @@ -604,7 +591,6 @@ bool Cell::hasText() const } - OutlinerParaObject* Cell::GetEditOutlinerParaObject() const { SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() ); @@ -614,7 +600,6 @@ OutlinerParaObject* Cell::GetEditOutlinerParaObject() const } - void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) { // only allow cell styles for cells @@ -628,7 +613,6 @@ void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) } - const SfxItemSet& Cell::GetObjectItemSet() { if( mpProperties ) @@ -673,14 +657,12 @@ void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const } - const SfxItemSet& Cell::GetItemSet() const { return mpProperties->GetObjectItemSet(); } - void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems) { if( mpProperties ) @@ -691,14 +673,12 @@ void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllIt } - sal_Int32 Cell::getMinimumWidth() { return GetTextLeftDistance() + GetTextRightDistance() + 100; } - sal_Int32 Cell::getMinimumHeight() { if( !mpProperties ) @@ -738,49 +718,42 @@ sal_Int32 Cell::getMinimumHeight() } - long Cell::GetTextLeftDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_LEFTDIST)).GetValue(); } - long Cell::GetTextRightDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_RIGHTDIST)).GetValue(); } - long Cell::GetTextUpperDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_UPPERDIST)).GetValue(); } - long Cell::GetTextLowerDistance() const { return static_cast<const SdrMetricItem&>(GetItemSet().Get(SDRATTR_TEXT_LOWERDIST)).GetValue(); } - SdrTextVertAdjust Cell::GetTextVerticalAdjust() const { return static_cast<const SdrTextVertAdjustItem&>(GetItemSet().Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); } - SdrTextHorzAdjust Cell::GetTextHorizontalAdjust() const { return static_cast<const SdrTextHorzAdjustItem&>(GetItemSet().Get(SDRATTR_TEXT_HORZADJUST)).GetValue(); } - void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) { SdrText::SetOutlinerParaObject( pTextObject ); @@ -791,7 +764,6 @@ void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject ) } - void Cell::AddUndo() { SdrObject& rObj = GetObject(); @@ -808,7 +780,6 @@ void Cell::AddUndo() } - sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell ) { if( pProperties ) @@ -818,7 +789,6 @@ sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextPro } - sdr::properties::TextProperties* Cell::CloneProperties( SdrObject& rNewObj, Cell& rNewCell ) { return CloneProperties(mpProperties,rNewObj,rNewCell); @@ -850,14 +820,12 @@ Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException, } - void SAL_CALL Cell::acquire() throw () { ::cppu::OWeakObject::acquire(); } - void SAL_CALL Cell::release() throw () { ::cppu::OWeakObject::release(); @@ -880,7 +848,6 @@ Sequence< Type > SAL_CALL Cell::getTypes( ) throw (RuntimeException, std::excep } - Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -895,7 +862,6 @@ css::awt::Size SAL_CALL Cell::getMinimumSize() } - css::awt::Size SAL_CALL Cell::getPreferredSize() throw (RuntimeException, std::exception) @@ -904,7 +870,6 @@ css::awt::Size SAL_CALL Cell::getPreferredSize() } - css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize ) throw (RuntimeException, std::exception) { return aNewSize; @@ -920,14 +885,12 @@ sal_Int32 SAL_CALL Cell::getRowSpan() throw (RuntimeException, std::exception) } - sal_Int32 SAL_CALL Cell::getColumnSpan() throw (RuntimeException, std::exception) { return mnColSpan; } - sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException, std::exception) { return mbMerged; @@ -943,7 +906,6 @@ OUString SAL_CALL Cell::getFormula( ) throw (RuntimeException, std::exception) } - void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeException, std::exception) { if( msFormula != aFormula ) @@ -953,14 +915,12 @@ void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeExcepti } - double SAL_CALL Cell::getValue( ) throw (RuntimeException, std::exception) { return mfValue; } - void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exception) { if( mfValue != nValue ) @@ -971,14 +931,12 @@ void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException, std::exce } - CellContentType SAL_CALL Cell::getType() throw (RuntimeException, std::exception) { return mnCellContentType; } - sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException, std::exception) { return mnError; @@ -1016,7 +974,6 @@ Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeE } - void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1161,7 +1118,6 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& } - Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1245,25 +1201,21 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow } - void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -1302,7 +1254,6 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName } - Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; @@ -1336,19 +1287,16 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP } - void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) { } - void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) { } - void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException, std::exception) { } @@ -1460,7 +1408,6 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th } - Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1491,7 +1438,6 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt } - void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1533,7 +1479,6 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U } - Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1607,7 +1552,6 @@ void SAL_CALL Cell::setAllPropertiesToDefault() } - void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception) { sal_Int32 nCount = aPropertyNames.getLength(); @@ -1618,7 +1562,6 @@ void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropert } - Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { sal_Int32 nCount = aPropertyNames.getLength(); @@ -1643,7 +1586,6 @@ void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, co } - void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent ) throw (NoSuchElementException, RuntimeException, std::exception) { SvxUnoTextBase::removeTextContent( xContent ); @@ -1660,14 +1602,12 @@ Reference< XTextCursor > SAL_CALL Cell::createTextCursor( ) throw (RuntimeExcep } - Reference< XTextCursor > SAL_CALL Cell::createTextCursorByRange( const Reference< XTextRange >& aTextPosition ) throw (RuntimeException, std::exception) { return SvxUnoTextBase::createTextCursorByRange( aTextPosition ); } - void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (RuntimeException, std::exception) { SvxUnoTextBase::insertString( xRange, aString, bAbsorb ); @@ -1675,7 +1615,6 @@ void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const O } - void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException, std::exception) { SvxUnoTextBase::insertControlCharacter( xRange, nControlCharacter, bAbsorb ); @@ -1692,21 +1631,18 @@ Reference< XText > SAL_CALL Cell::getText( ) throw (RuntimeException, std::exce } - Reference< XTextRange > SAL_CALL Cell::getStart( ) throw (RuntimeException, std::exception) { return SvxUnoTextBase::getStart(); } - Reference< XTextRange > SAL_CALL Cell::getEnd( ) throw (RuntimeException, std::exception) { return SvxUnoTextBase::getEnd(); } - OUString SAL_CALL Cell::getString( ) throw (RuntimeException, std::exception) { maSelection.nStartPara = EE_PARA_MAX_COUNT; @@ -1714,7 +1650,6 @@ OUString SAL_CALL Cell::getString( ) throw (RuntimeException, std::exception) } - void SAL_CALL Cell::setString( const OUString& aString ) throw (RuntimeException, std::exception) { SvxUnoTextBase::setString( aString ); diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 20ab6b4d8331..87f8166d746c 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -33,7 +33,6 @@ #include "svx/svdtext.hxx" - class SfxItemSet; class OutlinerParaObject; class SdrObject; @@ -43,11 +42,9 @@ namespace sdr { namespace properties { } } - namespace sdr { namespace table { - class SVX_DLLPUBLIC Cell : public SdrText, public SvxUnoTextBase, public css::table::XMergeableCell, @@ -225,7 +222,6 @@ private: }; - } } #endif diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 04620251ad21..f1fd2570e5de 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -27,7 +27,6 @@ #include "svdglob.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -35,7 +34,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::table; - namespace sdr { namespace table { CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) @@ -44,7 +42,6 @@ CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 } - CellCursor::~CellCursor() { } @@ -59,14 +56,12 @@ Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sa } - Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return CellRange::getCellRangeByPosition( nLeft, nTop, nRight, nBottom ); } - Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange ) throw (RuntimeException, std::exception) { return CellRange::getCellRangeByName( aRange ); @@ -83,7 +78,6 @@ void SAL_CALL CellCursor::gotoStart( ) throw (RuntimeException, std::exception) } - void SAL_CALL CellCursor::gotoEnd( ) throw (RuntimeException, std::exception) { mnLeft = mnRight; @@ -91,7 +85,6 @@ void SAL_CALL CellCursor::gotoEnd( ) throw (RuntimeException, std::exception) } - void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException, std::exception) { if( mxTable.is() ) @@ -120,7 +113,6 @@ void SAL_CALL CellCursor::gotoNext( ) throw (RuntimeException, std::exception) } - void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException, std::exception) { if( mxTable.is() ) @@ -141,7 +133,6 @@ void SAL_CALL CellCursor::gotoPrevious( ) throw (RuntimeException, std::excepti } - void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (RuntimeException, std::exception) { if( mxTable.is() ) @@ -240,7 +231,6 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd ) } - void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException, std::exception) { CellPos aStart, aEnd; @@ -275,7 +265,6 @@ void SAL_CALL CellCursor::merge( ) throw (NoSupportException, RuntimeException, } - void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< sal_Int32 >& rLeftOvers ) { const sal_Int32 nRowCount = mxTable->getRowCount(); @@ -379,7 +368,6 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< } - void CellCursor::split_horizontal( sal_Int32 nColumns ) { const sal_Int32 nRowCount = mxTable->getRowCount(); @@ -391,7 +379,6 @@ void CellCursor::split_horizontal( sal_Int32 nColumns ) } - void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_Int32 >& rLeftOvers ) { const sal_Int32 nColCount = mxTable->getColumnCount(); @@ -495,7 +482,6 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In } - void CellCursor::split_vertical( sal_Int32 nRows ) { const sal_Int32 nColCount = mxTable->getColumnCount(); @@ -507,7 +493,6 @@ void CellCursor::split_vertical( sal_Int32 nRows ) } - void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (NoSupportException, IllegalArgumentException, RuntimeException, std::exception) { if( (nColumns < 0) || (nRows < 0) ) @@ -546,7 +531,6 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No } - sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException, std::exception) { CellPos aStart, aEnd; @@ -554,7 +538,6 @@ sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException, std::exce } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index d17d4173b6f3..2c4430a35255 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -26,7 +26,6 @@ #include "cellrange.hxx" - namespace sdr { namespace table { struct CellPos; diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index f0adfa3f8db1..1f7dc02416ff 100644 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx @@ -21,14 +21,12 @@ #include "cellrange.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; - namespace sdr { namespace table { CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) @@ -41,7 +39,6 @@ CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 n } - CellRange::~CellRange() { } @@ -85,7 +82,6 @@ Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal } - Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if( (nLeft >= 0 ) && (nTop >= 0) && (nRight >= nLeft) && (nBottom >= nTop) ) @@ -106,14 +102,12 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nL } - Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { return Reference< XCellRange >(); } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 455adc5678b7..8f76b6f96752 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -26,7 +26,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { class CellRange : public ::cppu::WeakAggImplHelper1< css::table::XCellRange >, public ICellRange diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index 81bbc8b2bdb7..36b2ec78e407 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -32,13 +32,11 @@ FastPropertySetInfo::FastPropertySetInfo( const PropertyVector& rProps ) } - FastPropertySetInfo::~FastPropertySetInfo() { } - void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) { sal_uInt32 nIndex = maProperties.size(); @@ -54,7 +52,6 @@ void FastPropertySetInfo::addProperties( const PropertyVector& rProps ) } - const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw (UnknownPropertyException ) { PropertyMap::iterator aIter( maMap.find( aName ) ); @@ -64,7 +61,6 @@ const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw } - const Property* FastPropertySetInfo::hasProperty( const OUString& aName ) { PropertyMap::iterator aIter( maMap.find( aName ) ); @@ -84,14 +80,12 @@ Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties() throw (Runtim } - Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception) { return getProperty( aName ); } - sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException, std::exception) { return hasProperty( aName ) != nullptr; @@ -103,7 +97,6 @@ FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& x } - FastPropertySet::~FastPropertySet() { } @@ -118,39 +111,33 @@ Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo( ) t } - void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { setFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle, aValue ); } - Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { return getFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle ); } - void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -182,7 +169,6 @@ void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aP } - Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException, std::exception) { sal_Int32 nCount = aPropertyNames.getLength(); @@ -206,19 +192,16 @@ Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUS } - void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } - void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException, std::exception) { } diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 2288201c2311..5a27fbf25d7f 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -58,7 +58,6 @@ private: }; - class FastPropertySet : public ::cppu::WeakAggImplHelper3< css::beans::XPropertySet, css::beans::XMultiPropertySet, css::beans::XFastPropertySet > { public: diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 8fed5aab8486..62ad011ef575 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -466,7 +466,6 @@ bool SdrTableObjImpl::ApplyCellStyles() return bChanges; } - void SdrTableObjImpl::dispose() { disconnectTableStyle(); @@ -692,7 +691,6 @@ std::vector<sal_Int32> SdrTableObjImpl::getColumnWidths() const return aRet; } - sal_Int32 SdrTableObjImpl::getRowCount() const { return mxTable.is() ? mxTable->getRowCount() : 0; @@ -1061,7 +1059,6 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle ) } - TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, int nTol ) const { if( !mpImpl || !mpImpl->mxTable.is() ) @@ -1243,7 +1240,6 @@ SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const } - /** returns the number of texts available for this object. */ sal_Int32 SdrTableObj::getTextCount() const { @@ -1261,7 +1257,6 @@ sal_Int32 SdrTableObj::getTextCount() const } - /** changes the current active text */ void SdrTableObj::setActiveText( sal_Int32 nIndex ) { @@ -1509,14 +1504,12 @@ const CellRef& SdrTableObj::getActiveCell() const } - sal_Int32 SdrTableObj::getColumnCount() const { return mpImpl ? mpImpl->getColumnCount() : 0; } - void SdrTableObj::setActiveCell( const CellPos& rPos ) { if( mpImpl && mpImpl->mxTable.is() ) try @@ -1541,14 +1534,12 @@ void SdrTableObj::setActiveCell( const CellPos& rPos ) } - void SdrTableObj::getActiveCellPos( CellPos& rPos ) const { rPos = mpImpl->maEditPos; } - void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect ) { if( mpImpl ) @@ -1560,7 +1551,6 @@ void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect ) } - void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const { if( mpImpl ) @@ -1568,7 +1558,6 @@ void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const } - void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRect ) const { Rectangle aAnkRect(maRect); @@ -1585,7 +1574,6 @@ void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRec } - void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const { if( mpImpl ) @@ -1593,7 +1581,6 @@ void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* } - void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin ) const { Size aPaperMin,aPaperMax; @@ -1650,7 +1637,6 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* } - sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const { EVAnchorMode eRet=ANCHOR_TOP_LEFT; @@ -1678,7 +1664,6 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const } - OutlinerParaObject* SdrTableObj::GetEditOutlinerParaObject() const { return SdrTextObj::GetEditOutlinerParaObject(); @@ -1701,14 +1686,12 @@ OUString SdrTableObj::TakeObjNameSingul() const } - OUString SdrTableObj::TakeObjNamePlural() const { return ImpGetResStr(STR_ObjNamePluralTable); } - SdrTableObj* SdrTableObj::Clone() const { return CloneHelper< SdrTableObj >(); @@ -1741,63 +1724,53 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj) } - basegfx::B2DPolyPolygon SdrTableObj::TakeXorPoly() const { return SdrTextObj::TakeXorPoly(); } - basegfx::B2DPolyPolygon SdrTableObj::TakeContour() const { return SdrTextObj::TakeContour(); } - const Rectangle& SdrTableObj::GetSnapRect() const { return maRect; } - void SdrTableObj::NbcSetSnapRect(const Rectangle& rRect) { NbcSetLogicRect( rRect ); } - const Rectangle& SdrTableObj::GetLogicRect() const { return maLogicRect; } - void SdrTableObj::RecalcSnapRect() { } - sal_uInt32 SdrTableObj::GetSnapPointCount() const { return SdrTextObj::GetSnapPointCount(); } - - Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const { return SdrTextObj::GetSnapPoint(i); } - bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) { if( pEdtOutl != nullptr ) @@ -1839,7 +1812,6 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) } - void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) { if(rOutl.IsModified()) @@ -1893,7 +1865,6 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) } - OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const { CellRef xCell( getActiveCell() ); @@ -1904,7 +1875,6 @@ OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const } - void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject) { CellRef xCell( getActiveCell() ); @@ -1926,7 +1896,6 @@ void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject) } - void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) { maLogicRect=rRect; @@ -1943,8 +1912,6 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) } - - void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly = false */ ) { Rectangle aAdjustRect( rMaxRect ); @@ -1953,7 +1920,6 @@ void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnl } - void SdrTableObj::NbcMove(const Size& rSiz) { MoveRect(maLogicRect,rSiz); @@ -1963,7 +1929,6 @@ void SdrTableObj::NbcMove(const Size& rSiz) } - void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { Rectangle aOldRect( maLogicRect ); @@ -1975,7 +1940,6 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac } - bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { Rectangle aNeuRect(maLogicRect); @@ -1995,7 +1959,6 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) } - bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const { if((pModel == nullptr) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) @@ -2016,14 +1979,12 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, boo } - void SdrTableObj::NbcReformatText() { NbcAdjustTextFrameWidthAndHeight(); } - void SdrTableObj::ReformatText() { Rectangle aBoundRect0; @@ -2036,7 +1997,6 @@ void SdrTableObj::ReformatText() } - bool SdrTableObj::IsVerticalWriting() const { const SvxWritingModeItem* pModeItem = dynamic_cast< const SvxWritingModeItem* >( &GetObjectItem( SDRATTR_TEXTDIRECTION ) ); @@ -2044,7 +2004,6 @@ bool SdrTableObj::IsVerticalWriting() const } - void SdrTableObj::SetVerticalWriting(bool bVertical ) { if( bVertical != IsVerticalWriting() ) diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 96951694b8af..3bf5ff648925 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -26,7 +26,6 @@ #include "svx/svdotable.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -34,7 +33,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::beans; - namespace sdr { namespace table { const sal_Int32 Property_Width = 0; @@ -58,20 +56,17 @@ TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn ) } - TableColumn::~TableColumn() { } - void TableColumn::dispose() { mxTableModel.clear(); } - void TableColumn::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -79,7 +74,6 @@ void TableColumn::throwIfDisposed() const throw (css::uno::RuntimeException) } - TableColumn& TableColumn::operator=( const TableColumn& r ) { mnWidth = r.mnWidth; @@ -106,7 +100,6 @@ Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, s } - Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throwIfDisposed(); @@ -118,7 +111,6 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 } - Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { return Reference< XCellRange >(); @@ -134,7 +126,6 @@ OUString SAL_CALL TableColumn::getName() throw (RuntimeException, std::exception } - void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeException, std::exception) { maName = aName; @@ -232,7 +223,6 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a } - Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { switch( nHandle ) @@ -246,7 +236,6 @@ Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (Unkno } - rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { static rtl::Reference< FastPropertySetInfo > xInfo; @@ -304,7 +293,6 @@ sal_Int32 TableColumn::getWidth() const return mnWidth; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index cc768458692b..0c5083d5ce8f 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -28,7 +28,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableColumnBase; diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 10f0184dcfeb..eaf01178c979 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -24,14 +24,12 @@ #include "tablecolumn.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; - namespace sdr { namespace table { TableColumns::TableColumns( const TableModelRef& xTableModel ) @@ -40,21 +38,18 @@ TableColumns::TableColumns( const TableModelRef& xTableModel ) } - TableColumns::~TableColumns() { dispose(); } - void TableColumns::dispose() { mxTableModel.clear(); } - void TableColumns::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -72,7 +67,6 @@ void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) } - void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -90,7 +84,6 @@ sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException, std::except } - Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { throwIfDisposed(); @@ -113,7 +106,6 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException, std::excep } - sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -122,7 +114,6 @@ sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException, std::exce } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 8c350e2e5876..0da242abd16a 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -26,7 +26,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { class TableColumns : public ::cppu::WeakAggImplHelper1< css::table::XTableColumns > diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 718b500d5c3f..d055849d3819 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -128,7 +128,6 @@ rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView } - rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController ) { if( xRefController.is() ) @@ -141,7 +140,6 @@ rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEdi } - SvxTableController::SvxTableController( SdrObjEditView* pView, const SdrObject* pObj ) : mbCellSelectionMode(false) , mbLeftButtonDown(false) @@ -191,7 +189,6 @@ SvxTableController::~SvxTableController() } - const sal_uInt16 ACTION_NONE = 0; const sal_uInt16 ACTION_GOTO_FIRST_CELL = 1; const sal_uInt16 ACTION_GOTO_FIRST_COLUMN = 2; @@ -337,7 +334,6 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* } - bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* /*pWin*/) { if( !checkTableObject() ) @@ -352,7 +348,6 @@ bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* / } - bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWindow ) { if( !checkTableObject() ) @@ -384,7 +379,6 @@ bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWind } - void SvxTableController::onSelectionHasChanged() { bool bSelected = false; @@ -421,7 +415,6 @@ void SvxTableController::onSelectionHasChanged() } - void SvxTableController::GetState( SfxItemSet& rSet ) { if( !mxTable.is() || !mxTableObj.is() || !mxTableObj->GetModel() ) @@ -520,7 +513,6 @@ void SvxTableController::GetState( SfxItemSet& rSet ) } - void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) { sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); @@ -797,7 +789,6 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) } - void SvxTableController::onDelete( sal_uInt16 nSId ) { sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( mxTableObj.get() ); @@ -856,7 +847,6 @@ void SvxTableController::onDelete( sal_uInt16 nSId ) } - void SvxTableController::onSelect( sal_uInt16 nSId ) { if( mxTable.is() ) @@ -1460,7 +1450,6 @@ bool SvxTableController::checkTableObject() } - sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* /*pWindow*/ ) { const bool bMod1 = rKEvt.GetKeyCode().IsMod1(); // ctrl @@ -1759,7 +1748,6 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W } - void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Window* pWindow, sal_uInt16 nAction ) { if( mxTableObj.is() && static_cast<SdrTableObj*>(mxTableObj.get())->IsTextEditActive() ) @@ -1788,7 +1776,6 @@ void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Windo } - const CellPos& SvxTableController::getSelectionStart() { checkCell( maCursorFirstPos ); @@ -1796,14 +1783,12 @@ const CellPos& SvxTableController::getSelectionStart() } - void SvxTableController::setSelectionStart( const CellPos& rPos ) { maCursorFirstPos = rPos; } - const CellPos& SvxTableController::getSelectionEnd() { checkCell( maCursorLastPos ); @@ -1811,7 +1796,6 @@ const CellPos& SvxTableController::getSelectionEnd() } - void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ) { if( mxTable.is() ) try @@ -1839,9 +1823,6 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s } - - - void SvxTableController::checkCell( CellPos& rPos ) { if( mxTable.is() ) try @@ -1859,7 +1840,6 @@ void SvxTableController::checkCell( CellPos& rPos ) } - void SvxTableController::findMergeOrigin( CellPos& rPos ) { if( mxTable.is() ) try @@ -1877,7 +1857,6 @@ void SvxTableController::findMergeOrigin( CellPos& rPos ) } - void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ ) { SdrPageView* pPV = mpView->GetSdrPageView(); @@ -1987,7 +1966,6 @@ bool SvxTableController::StopTextEdit() } - void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast ) { if( mbCellSelectionMode ) @@ -2071,7 +2049,6 @@ void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast ) } - void SvxTableController::StartSelection( const CellPos& rPos ) { StopTextEdit(); @@ -2081,7 +2058,6 @@ void SvxTableController::StartSelection( const CellPos& rPos ) } - void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos& rEnd ) { StopTextEdit(); @@ -2091,7 +2067,6 @@ void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos& } - void SvxTableController::UpdateSelection( const CellPos& rPos ) { maCursorLastPos = rPos; @@ -2099,14 +2074,12 @@ void SvxTableController::UpdateSelection( const CellPos& rPos ) } - void SvxTableController::clearSelection() { RemoveSelection(); } - void SvxTableController::selectAll() { if( mxTable.is() ) @@ -2120,7 +2093,6 @@ void SvxTableController::selectAll() } - void SvxTableController::RemoveSelection() { if( mbCellSelectionMode ) @@ -2131,7 +2103,6 @@ void SvxTableController::RemoveSelection() } - void SvxTableController::onTableModified() { if( mnUpdateEvent == nullptr ) @@ -2214,7 +2185,6 @@ void SvxTableController::updateSelectionOverlay() } - void SvxTableController::destroySelectionOverlay() { if( mpSelectionOverlay ) @@ -2233,7 +2203,6 @@ void SvxTableController::destroySelectionOverlay() } - void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnlyHardAttr) const { if( mxTable.is() ) @@ -2275,7 +2244,6 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl } - const sal_uInt16 CELL_BEFORE = 0x0001; const sal_uInt16 CELL_LEFT = 0x0002; const sal_uInt16 CELL_RIGHT = 0x0004; @@ -2287,7 +2255,6 @@ const sal_uInt16 CELL_BOTTOM = 0x0040; const sal_uInt16 CELL_LOWER = 0x0080; - static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, SvxBoxItemLine nLine ) { if( pNew ) @@ -2305,7 +2272,6 @@ static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine } - static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SvxBoxItem& rNewFrame ) { if( (nCellFlags & (CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 ) @@ -2363,7 +2329,6 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, } - static void ImplSetLineColor( SvxBoxItem& rNewFrame, SvxBoxItemLine nLine, const Color& rColor ) { const SvxBorderLine* pSourceLine = rNewFrame.GetLine( nLine ); @@ -2376,7 +2341,6 @@ static void ImplSetLineColor( SvxBoxItem& rNewFrame, SvxBoxItemLine nLine, const } - static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* pLineColorItem, SvxBoxItem& rNewFrame ) { const Color aColor( pLineColorItem->GetValue() ); @@ -2395,7 +2359,6 @@ static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* p } - static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine* pBorderLineItem, SvxBoxItem& rNewFrame ) { if( (nCellFlags & ( CELL_BEFORE|CELL_AFTER|CELL_UPPER|CELL_LOWER)) != 0 ) @@ -2441,7 +2404,6 @@ static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine* } - void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) { if( mxTable.is() ) @@ -2530,7 +2492,6 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) } - void SvxTableController::UpdateTableShape() { SdrObject* pTableObj = mxTableObj.get(); @@ -2543,8 +2504,6 @@ void SvxTableController::UpdateTableShape() } - - void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bReplaceAll) { if( mxTable.is() ) @@ -2596,7 +2555,6 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR } - bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if( mxTableObj.is() && hasSelectedCells() ) @@ -2626,7 +2584,6 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt } - bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { if( mbCellSelectionMode || mpView->IsTextEdit() ) @@ -2638,7 +2595,6 @@ bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) } - bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) { if( mxTableObj.is() && mbCellSelectionMode && pNewPage ) try @@ -2666,7 +2622,6 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage ) } - bool SvxTableController::PasteObjModel( const SdrModel& rModel ) { if( mxTableObj.is() && mpView && (rModel.GetPageCount() >= 1) ) @@ -2686,7 +2641,6 @@ bool SvxTableController::PasteObjModel( const SdrModel& rModel ) } - bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj ) { if( !pPasteTableObj ) @@ -2824,8 +2778,6 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo } - - IMPL_LINK_NOARG_TYPED(SvxTableController, UpdateHdl, void*, void) { mnUpdateEvent = nullptr; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index c3cca01915f7..dfd3b5edc05d 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -251,14 +251,12 @@ sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException, std::exce } - OUString SAL_CALL TableDesignStyle::getParentStyle() throw (RuntimeException, std::exception) { return OUString(); } - void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchElementException, RuntimeException, std::exception) { } @@ -273,7 +271,6 @@ OUString SAL_CALL TableDesignStyle::getName() throw (RuntimeException, std::exce } - void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeException, std::exception) { msName = rName; @@ -297,7 +294,6 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl } - Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -306,7 +302,6 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE } - sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -327,7 +322,6 @@ Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException, std::ex } - sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException, std::exception) { return sal_True; @@ -343,7 +337,6 @@ sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException, std::exc } - Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -424,14 +417,12 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe } - void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener ); } - void TableDesignStyle::notifyModifyListener() { MutexGuard aGuard( rBHelper.rMutex ); @@ -455,7 +446,6 @@ void SAL_CALL TableDesignStyle::modified( const css::lang::EventObject& ) throw } - void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { } @@ -464,7 +454,6 @@ void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw // TableStyle - // XServiceInfo OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException, std::exception) { @@ -510,7 +499,6 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE } - Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -527,7 +515,6 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime } - sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -551,7 +538,6 @@ Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException, std::e } - sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -571,7 +557,6 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException, std::ex } - Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -605,7 +590,6 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& } - void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -664,7 +648,6 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Excep } - Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >& ) throw(Exception, RuntimeException, std::exception) { return createInstance(); @@ -688,13 +671,11 @@ void SAL_CALL TableDesignFamily::dispose( ) throw (RuntimeException, std::excep } - void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) { } - void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >& ) throw (RuntimeException, std::exception) { } @@ -710,14 +691,12 @@ Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (Runti } - void TableDesignFamily::setPropertyValue( const OUString& , const Any& ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { if ( PropertyName == "DisplayName" ) @@ -732,36 +711,30 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U } - void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { OSL_FAIL( "###unexpected!" ); } - - Reference< XNameAccess > CreateTableDesignFamily() { return new TableDesignFamily(); diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 74227c6f338a..20c5788e5bbf 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -41,7 +41,6 @@ namespace sdr { namespace table { - class OverlayTableEdge : public sdr::overlay::OverlayObject { protected: @@ -57,7 +56,6 @@ public: }; - TableEdgeHdl::TableEdgeHdl( const Point& rPnt, bool bHorizontal, sal_Int32 nMin, sal_Int32 nMax, sal_Int32 nEdges ) : SdrHdl( rPnt, HDL_USER ) , mbHorizontal( bHorizontal ) @@ -200,7 +198,6 @@ void TableEdgeHdl::CreateB2dIAObject() } - OverlayTableEdge::OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ) : OverlayObject(Color(COL_GRAY)) , maPolyPolygon( rPolyPolygon ) @@ -245,7 +242,6 @@ drawinglayer::primitive2d::Primitive2DSequence OverlayTableEdge::createOverlayOb } - TableBorderHdl::TableBorderHdl( const Rectangle& rRect, bool bAnimate) diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index 07ff615be994..16b159732825 100644 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx @@ -25,7 +25,6 @@ #include <svx/svdhdl.hxx> - namespace sdr { namespace table { enum TableEdgeState { Empty, Invisible, Visible }; diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 62d179f7b718..291a6bf100c7 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -49,15 +49,12 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; - namespace sdr { namespace table { - static SvxBorderLine gEmptyBorder; - TableLayouter::TableLayouter( const TableModelRef& xTableModel ) : mxTable( xTableModel ) , msSize( "Size" ) @@ -65,14 +62,12 @@ TableLayouter::TableLayouter( const TableModelRef& xTableModel ) } - TableLayouter::~TableLayouter() { ClearBorderLayout(); } - basegfx::B2ITuple TableLayouter::getCellSize( const CellRef& xCell, const CellPos& rPos ) const { sal_Int32 width = 0; @@ -116,7 +111,6 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellRef& xCell, const CellPo } - bool TableLayouter::getCellArea( const CellRef& xCell, const CellPos& rPos, basegfx::B2IRectangle& rArea ) const { try @@ -171,7 +165,6 @@ sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const } - bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const { const BorderLineMap& rMap = bHorizontal ? maHorizontalBorders : maVerticalBorders; @@ -190,7 +183,6 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor } - /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const { @@ -214,7 +206,6 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, } - sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { sal_Int32 nRet = 0; @@ -245,7 +236,6 @@ sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/ } - sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { sal_Int32 nRet = 0; @@ -300,7 +290,6 @@ sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, } - static bool checkMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 nMergedY, sal_Int32 nCellX, sal_Int32 nCellY, bool& bRunning ) { Reference< XMergeableCell > xCell( xTable->getCellByPosition( nCellX, nCellY ), UNO_QUERY ); @@ -421,7 +410,6 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 } - sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) { if( isValidColumn( nColumn ) ) @@ -436,7 +424,6 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) } - sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ) { // break loops after 100 runs to avoid freezing office due to developer error @@ -506,13 +493,11 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu } - typedef std::vector< CellRef > MergeableCellVector; typedef std::vector< MergeableCellVector > MergeVector; typedef std::vector< sal_Int32 > Int32Vector; - void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) { const sal_Int32 nColCount = getColumnCount(); @@ -665,7 +650,6 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) } - void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) { const sal_Int32 nColCount = getColumnCount(); @@ -823,7 +807,6 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) } - /** try to fit the table into the given rectangle. If the rectangle is to small, it will be grown to fit the table. */ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFitHeight ) @@ -856,7 +839,6 @@ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFi } - void TableLayouter::updateCells( Rectangle& rRectangle ) { const sal_Int32 nColCount = getColumnCount(); @@ -887,7 +869,6 @@ void TableLayouter::updateCells( Rectangle& rRectangle ) } - CellRef TableLayouter::getCell( const CellPos& rPos ) const { CellRef xCell; @@ -903,7 +884,6 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const } - bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) { if (!pThis || ((pThis == &gEmptyBorder) && (pOther != nullptr))) @@ -939,7 +919,6 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine } - void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine ) { if( pLine == nullptr ) @@ -962,7 +941,6 @@ void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, } - void TableLayouter::ClearBorderLayout() { ClearBorderLayout(maHorizontalBorders); @@ -970,7 +948,6 @@ void TableLayouter::ClearBorderLayout() } - void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) { const sal_Int32 nColCount = rMap.size(); @@ -993,7 +970,6 @@ void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) } - void TableLayouter::ResizeBorderLayout() { ClearBorderLayout(); @@ -1002,7 +978,6 @@ void TableLayouter::ResizeBorderLayout() } - void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) { const sal_Int32 nColCount = getColumnCount() + 1; @@ -1019,7 +994,6 @@ void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) } - void TableLayouter::UpdateBorderLayout() { // make sure old border layout is cleared and border maps have correct size @@ -1062,7 +1036,6 @@ void TableLayouter::UpdateBorderLayout() } - void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol ) { if( mxTable.is() ) try @@ -1101,7 +1074,6 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, } - void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow ) { if( mxTable.is() ) try diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 9cd73599cb6d..0ab692c2591c 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -34,7 +34,6 @@ class Rectangle; - namespace editeng { class SvxBorderLine; } diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 0bef744e5285..c9ea1c292dbb 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -47,11 +47,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - namespace sdr { namespace table { - // removes the given range from a vector template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) { @@ -85,7 +83,6 @@ template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIn } - /** inserts a range into a vector */ template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) { @@ -113,7 +110,6 @@ template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVec } - TableModel::TableModel( SdrTableObj* pTableObj ) : TableModelBase( m_aMutex ) , mpTableObj( pTableObj ) @@ -159,13 +155,11 @@ TableModel::TableModel( SdrTableObj* pTableObj, const TableModelRef& xSourceTabl } - TableModel::~TableModel() { } - void TableModel::init( sal_Int32 nColumns, sal_Int32 nRows ) { if( nRows < 20 ) @@ -197,35 +191,30 @@ sal_Int32 TableModel::getLeft() } - sal_Int32 TableModel::getTop() { return 0; } - sal_Int32 TableModel::getRight() { return getColumnCount(); } - sal_Int32 TableModel::getBottom() { return getRowCount(); } - Reference< XTable > TableModel::getTable() { return this; } - void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount ) { TableModelNotifyGuard aGuard( this ); @@ -237,7 +226,6 @@ void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows ) { TableModelNotifyGuard aGuard( this ); @@ -254,7 +242,6 @@ void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows ) } - void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount ) { TableModelNotifyGuard aGuard( this ); @@ -270,7 +257,6 @@ void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellVector& aCells ) { TableModelNotifyGuard aGuard( this ); @@ -309,7 +295,6 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep } - Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -323,7 +308,6 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen } - sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -331,7 +315,6 @@ sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException, std::excep } - sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -356,14 +339,12 @@ void TableModel::dispose() throw (RuntimeException, std::exception) } - void SAL_CALL TableModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { TableModelBase::addEventListener( xListener ); } - void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) { TableModelBase::removeEventListener( xListener ); @@ -380,7 +361,6 @@ sal_Bool SAL_CALL TableModel::isModified( ) throw (RuntimeException, std::excep } - void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException, std::exception) { { @@ -401,7 +381,6 @@ void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& } - void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<XModifyListener>::get() , xListener ); @@ -421,7 +400,6 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep } - Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -447,7 +425,6 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa } - Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -462,7 +439,6 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 n } - Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { return Reference< XCellRange >(); @@ -479,38 +455,32 @@ Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo( ) throw } - void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { } - Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { return Any(); } - void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } - void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } @@ -524,7 +494,6 @@ void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const A } - Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Any aAny; @@ -541,14 +510,12 @@ sal_Int32 TableModel::getRowCountImpl() const } - sal_Int32 TableModel::getColumnCountImpl() const { return static_cast< sal_Int32 >( maColumns.size() ); } - void TableModel::disposing() { if( !maRows.empty() ) @@ -628,7 +595,6 @@ void TableModel::notifyModification() } - CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const { if( ((nRow >= 0) && (nRow < getRowCountImpl())) && (nCol >= 0) && (nCol < getColumnCountImpl()) ) @@ -643,7 +609,6 @@ CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const } - CellRef TableModel::createCell() { CellRef xCell; @@ -653,7 +618,6 @@ CellRef TableModel::createCell() } - void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) { if( nCount && mpTableObj ) @@ -734,7 +698,6 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) { sal_Int32 nColCount = getColumnCountImpl(); @@ -844,7 +807,6 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) { if( nCount && mpTableObj ) @@ -907,7 +869,6 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount ) } - void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) { sal_Int32 nRowCount = getRowCountImpl(); @@ -1003,7 +964,6 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount ) } - TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsException) { if( (nRow >= 0) && (nRow < getRowCountImpl()) ) @@ -1013,7 +973,6 @@ TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsEx } - TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutOfBoundsException) { if( (nColumn >= 0) && (nColumn < getColumnCountImpl()) ) @@ -1023,7 +982,6 @@ TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutO } - /** deletes rows and columns that are completely merged. Must be called between BegUndo/EndUndo! */ void TableModel::optimize() { @@ -1114,7 +1072,6 @@ void TableModel::optimize() } - void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan ) { SdrModel* pModel = mpTableObj->GetModel(); diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index cf9d2535ad49..71c34f3eebca 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -31,7 +31,6 @@ #include "celltypes.hxx" - namespace sdr { namespace table { class SdrTableObj; diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 608f66934f5d..321bfa84ad7c 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -27,7 +27,6 @@ #include "svx/svdotable.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -35,7 +34,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::beans; - namespace sdr { namespace table { const sal_Int32 Property_Height = 0; @@ -64,13 +62,11 @@ TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 } - TableRow::~TableRow() { } - void TableRow::dispose() { mxTableModel.clear(); @@ -84,7 +80,6 @@ void TableRow::dispose() } - void TableRow::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -92,7 +87,6 @@ void TableRow::throwIfDisposed() const throw (css::uno::RuntimeException) } - TableRow& TableRow::operator=( const TableRow& r ) { mnHeight = r.mnHeight; @@ -106,7 +100,6 @@ TableRow& TableRow::operator=( const TableRow& r ) } - void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter /* = 0 */ ) { throwIfDisposed(); @@ -126,7 +119,6 @@ void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::it } - void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) { throwIfDisposed(); @@ -175,7 +167,6 @@ Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_ } - Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throwIfDisposed(); @@ -187,7 +178,6 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLe } - Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -204,7 +194,6 @@ OUString SAL_CALL TableRow::getName() throw (RuntimeException, std::exception) } - void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException, std::exception) { maName = aName; @@ -306,7 +295,6 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal } - Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { switch( nHandle ) @@ -320,7 +308,6 @@ Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownP } - rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { static rtl::Reference< FastPropertySetInfo > xInfo; @@ -369,8 +356,6 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() } - - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 88498f2e50f4..a6719c8564b1 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -28,7 +28,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableRowBase; diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index fdbd19c94ebb..e816f7efe53c 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -25,14 +25,12 @@ #include "tablerows.hxx" - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::table; - namespace sdr { namespace table { TableRows::TableRows( const TableModelRef& xTableModel ) @@ -41,21 +39,18 @@ TableRows::TableRows( const TableModelRef& xTableModel ) } - TableRows::~TableRows() { dispose(); } - void TableRows::dispose() { mxTableModel.clear(); } - void TableRows::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) @@ -73,7 +68,6 @@ void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr } - void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -91,7 +85,6 @@ sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException, std::exception } - Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { throwIfDisposed(); @@ -109,7 +102,6 @@ Type SAL_CALL TableRows::getElementType() throw (RuntimeException, std::exceptio } - sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException, std::exception) { throwIfDisposed(); @@ -117,7 +109,6 @@ sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException, std::excepti } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index d9bb4fed942b..a9b6fc19e8c6 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -26,7 +26,6 @@ #include "tablemodel.hxx" - namespace sdr { namespace table { class TableRows : public ::cppu::WeakAggImplHelper1< css::table::XTableRows > diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index eb0184780615..cb0093fbc80e 100644 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -28,13 +28,10 @@ #include "tablecolumn.hxx" - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; - namespace sdr { namespace table { CellUndo::CellUndo( const SdrObjectWeakRef& xObjRef, const CellRef& xCell ) @@ -173,7 +170,6 @@ static void Dispose( RowVector& rRows ) } - InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, RowVector& aNewRows ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) , mxTable( xTable ) @@ -184,7 +180,6 @@ InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row } - InsertRowUndo::~InsertRowUndo() { if( !mbUndo ) @@ -192,7 +187,6 @@ InsertRowUndo::~InsertRowUndo() } - void InsertRowUndo::Undo() { if( mxTable.is() ) @@ -203,7 +197,6 @@ void InsertRowUndo::Undo() } - void InsertRowUndo::Redo() { if( mxTable.is() ) @@ -227,7 +220,6 @@ RemoveRowUndo::RemoveRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row } - RemoveRowUndo::~RemoveRowUndo() { if( mbUndo ) @@ -235,7 +227,6 @@ RemoveRowUndo::~RemoveRowUndo() } - void RemoveRowUndo::Undo() { if( mxTable.is() ) @@ -246,7 +237,6 @@ void RemoveRowUndo::Undo() } - void RemoveRowUndo::Redo() { if( mxTable.is() ) @@ -268,7 +258,6 @@ static void Dispose( ColumnVector& rCols ) } - static void Dispose( CellVector& rCells ) { CellVector::iterator aIter( rCells.begin() ); @@ -277,7 +266,6 @@ static void Dispose( CellVector& rCells ) } - InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, ColumnVector& aNewCols, CellVector& aCells ) : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() ) , mxTable( xTable ) @@ -289,7 +277,6 @@ InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col } - InsertColUndo::~InsertColUndo() { if( !mbUndo ) @@ -300,7 +287,6 @@ InsertColUndo::~InsertColUndo() } - void InsertColUndo::Undo() { if( mxTable.is() ) @@ -311,7 +297,6 @@ void InsertColUndo::Undo() } - void InsertColUndo::Redo() { if( mxTable.is() ) @@ -336,7 +321,6 @@ RemoveColUndo::RemoveColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col } - RemoveColUndo::~RemoveColUndo() { if( mbUndo ) @@ -347,7 +331,6 @@ RemoveColUndo::~RemoveColUndo() } - void RemoveColUndo::Undo() { if( mxTable.is() ) @@ -358,7 +341,6 @@ void RemoveColUndo::Undo() } - void RemoveColUndo::Redo() { if( mxTable.is() ) @@ -381,13 +363,11 @@ TableColumnUndo::TableColumnUndo( const TableColumnRef& xCol ) } - TableColumnUndo::~TableColumnUndo() { } - void TableColumnUndo::Undo() { if( !mbHasRedoData ) @@ -399,14 +379,12 @@ void TableColumnUndo::Undo() } - void TableColumnUndo::Redo() { setData( maRedoData ); } - bool TableColumnUndo::Merge( SfxUndoAction *pNextAction ) { TableColumnUndo* pNext = dynamic_cast< TableColumnUndo* >( pNextAction ); @@ -414,7 +392,6 @@ bool TableColumnUndo::Merge( SfxUndoAction *pNextAction ) } - void TableColumnUndo::setData( const Data& rData ) { mxCol->mnColumn = rData.mnColumn; @@ -429,7 +406,6 @@ void TableColumnUndo::setData( const Data& rData ) } - void TableColumnUndo::getData( Data& rData ) { rData.mnColumn = mxCol->mnColumn; @@ -453,13 +429,11 @@ TableRowUndo::TableRowUndo( const TableRowRef& xRow ) } - TableRowUndo::~TableRowUndo() { } - void TableRowUndo::Undo() { if( !mbHasRedoData ) @@ -471,14 +445,12 @@ void TableRowUndo::Undo() } - void TableRowUndo::Redo() { setData( maRedoData ); } - bool TableRowUndo::Merge( SfxUndoAction *pNextAction ) { TableRowUndo* pNext = dynamic_cast< TableRowUndo* >( pNextAction ); @@ -486,7 +458,6 @@ bool TableRowUndo::Merge( SfxUndoAction *pNextAction ) } - void TableRowUndo::setData( const Data& rData ) { mxRow->mnRow = rData.mnRow; @@ -501,7 +472,6 @@ void TableRowUndo::setData( const Data& rData ) } - void TableRowUndo::getData( Data& rData ) { rData.mnRow = mxRow->mnRow; @@ -513,7 +483,6 @@ void TableRowUndo::getData( Data& rData ) } - TableStyleUndo::TableStyleUndo( const SdrTableObj& rTableObj ) : SdrUndoAction( *rTableObj.GetModel() ) , mxObjRef( const_cast< sdr::table::SdrTableObj*>( &rTableObj ) ) diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index dca50c82e603..36e5158534ed 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -37,7 +37,6 @@ namespace sdr { namespace properties { class OutlinerParaObject; - namespace sdr { namespace table { class CellUndo : public SdrUndoAction, public sdr::ObjectUser @@ -92,7 +91,6 @@ private: }; - class InsertRowUndo : public SdrUndoAction { public: @@ -110,7 +108,6 @@ private: }; - class RemoveRowUndo : public SdrUndoAction { public: @@ -128,7 +125,6 @@ private: }; - class InsertColUndo : public SdrUndoAction { public: @@ -147,7 +143,6 @@ private: }; - class RemoveColUndo : public SdrUndoAction { public: @@ -166,7 +161,6 @@ private: }; - class TableColumnUndo : public SdrUndoAction { public: @@ -207,7 +201,6 @@ private: }; - class TableRowUndo : public SdrUndoAction { public: diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index ead137b261f8..4db33488187a 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -42,12 +42,10 @@ #include "tablelayouter.hxx" - using editeng::SvxBorderLine; using namespace com::sun::star; - namespace drawinglayer { namespace primitive2d @@ -148,7 +146,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace drawinglayer { namespace primitive2d @@ -471,7 +468,6 @@ namespace drawinglayer } // end of namespace drawinglayer - namespace sdr { namespace contact diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 80bda78901aa..9d59df58f839 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -127,7 +127,6 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) } - void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled ) { if( mpDirectionSet ) @@ -152,7 +151,6 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled } - void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bEnabled ) { checkEntry( 0, (nProjection == 0) && bEnabled ); @@ -162,7 +160,6 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE } - void ExtrusionDirectionWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) @@ -196,7 +193,6 @@ void ExtrusionDirectionWindow::statusChanged( } - IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); @@ -244,7 +240,6 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( } - VclPtr<vcl::Window> ExtrusionDirectionControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionDirectionWindow>::Create( *this, m_xFrame, pParent ); @@ -271,7 +266,6 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -279,7 +273,6 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) @@ -288,14 +281,12 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstan } - OUString SAL_CALL ExtrusionDirectionControl::getImplementationName( ) throw (RuntimeException, std::exception) { return ExtrusionDirectionControl_getImplementationName(); } - Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return ExtrusionDirectionControl_getSupportedServiceNames(); @@ -379,7 +370,6 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth ) } - void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) { meUnit = eUnit; @@ -393,7 +383,6 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) } - void ExtrusionDepthWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) @@ -487,7 +476,6 @@ ExtrusionDepthController::ExtrusionDepthController( } - VclPtr<vcl::Window> ExtrusionDepthController::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionDepthWindow>::Create( *this, m_xFrame, pParent ); @@ -514,7 +502,6 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -522,7 +509,6 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames( } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) ); @@ -647,7 +633,6 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) } - void ExtrusionLightingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) @@ -681,7 +666,6 @@ void ExtrusionLightingWindow::statusChanged( } - void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) { ToolbarMenu::DataChanged( rDCEvt ); @@ -696,7 +680,6 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) } - IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); @@ -748,7 +731,6 @@ void ExtrusionLightingWindow::SelectHdl(void* pControl) } - ExtrusionLightingControl::ExtrusionLightingControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, @@ -759,7 +741,6 @@ ExtrusionLightingControl::ExtrusionLightingControl( } - VclPtr<vcl::Window> ExtrusionLightingControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionLightingWindow>::Create( *this, m_xFrame, pParent ); @@ -786,7 +767,6 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -794,7 +774,6 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames( } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) @@ -803,14 +782,12 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstanc } - OUString SAL_CALL ExtrusionLightingControl::getImplementationName( ) throw (RuntimeException, std::exception) { return ExtrusionLightingControl_getImplementationName(); } - Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return ExtrusionLightingControl_getSupportedServiceNames(); @@ -869,7 +846,6 @@ void ExtrusionSurfaceWindow::statusChanged( } - IMPL_LINK_NOARG_TYPED(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) { if ( IsInPopupMode() ) @@ -889,7 +865,6 @@ IMPL_LINK_NOARG_TYPED(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) } - ExtrusionSurfaceControl::ExtrusionSurfaceControl( const Reference< XComponentContext >& rxContext ) @@ -902,7 +877,6 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( } - VclPtr<vcl::Window> ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<ExtrusionSurfaceWindow>::Create( *this, m_xFrame, pParent ); @@ -929,7 +903,6 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() } - Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -937,7 +910,6 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() } - Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) @@ -946,14 +918,12 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance } - OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName( ) throw (RuntimeException, std::exception) { return ExtrusionSurfaceControl_getImplementationName(); } - Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return ExtrusionSurfaceControl_getSupportedServiceNames(); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index c2d714eb228e..0f9f731c3983 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -34,7 +34,6 @@ class ValueSet; - namespace svx { class ExtrusionDirectionWindow : public svtools::ToolbarMenu @@ -68,7 +67,6 @@ private: }; - class ExtrusionDirectionControl : public svt::PopupWindowController { public: @@ -135,7 +133,6 @@ public: }; - class ExtrusionLightingWindow : public svtools::ToolbarMenu { private: @@ -174,7 +171,6 @@ public: }; - class ExtrusionLightingControl : public svt::PopupWindowController { public: @@ -194,7 +190,6 @@ public: }; - class ExtrusionSurfaceWindow : public svtools::ToolbarMenu { private: @@ -218,7 +213,6 @@ public: }; - class ExtrusionSurfaceControl : public svt::PopupWindowController { public: @@ -238,7 +232,6 @@ public: }; - } #endif diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index d92e3e57f65d..28cd5274fec0 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -229,7 +229,6 @@ void FontWorkGalleryDialog::insertSelectedFontwork() } - IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) { insertSelectedFontwork(); @@ -237,7 +236,6 @@ IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) } - IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) { insertSelectedFontwork(); @@ -245,7 +243,6 @@ IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, } - class FontworkAlignmentWindow : public ToolbarMenu { public: @@ -357,15 +354,12 @@ public: }; - - FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) { } - VclPtr<vcl::Window> FontworkAlignmentControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<FontworkAlignmentWindow>::Create( *this, m_xFrame, pParent ); @@ -392,7 +386,6 @@ OUString SAL_CALL FontworkAlignmentControl_getImplementationName() } - Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -400,21 +393,18 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames( } - Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) ); } - OUString SAL_CALL FontworkAlignmentControl::getImplementationName( ) throw (RuntimeException, std::exception) { return FontworkAlignmentControl_getImplementationName(); } - Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return FontworkAlignmentControl_getSupportedServiceNames(); @@ -488,7 +478,6 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact } - void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnabled ) { enableEntry( 6, bEnabled ); @@ -496,7 +485,6 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnab } - void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) ) @@ -528,7 +516,6 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta } - IMPL_LINK_NOARG_TYPED(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void) { if ( IsInPopupMode() ) @@ -600,7 +587,6 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc } - VclPtr<vcl::Window> FontworkCharacterSpacingControl::createPopupWindow( vcl::Window* pParent ) { return VclPtr<FontworkCharacterSpacingWindow>::Create( *this, m_xFrame, pParent ); @@ -627,7 +613,6 @@ OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName() } - Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; @@ -635,21 +620,18 @@ Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServic } - Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) ); } - OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName( ) throw (RuntimeException, std::exception) { return FontworkCharacterSpacingControl_getImplementationName(); } - Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return FontworkCharacterSpacingControl_getSupportedServiceNames(); diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 63a388ccf779..250273190957 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -47,7 +47,6 @@ FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlot } - FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() { m_aDoubleClickTimer.Stop(); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 5bc35bcbee25..8dd2ed669fd9 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -69,7 +69,6 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, } - IMPL_LINK_NOARG_TYPED(SvxLineBox, DelayHdl_Impl, Timer *, void) { if ( GetEntryCount() == 0 ) @@ -80,7 +79,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineBox, DelayHdl_Impl, Timer *, void) } - void SvxLineBox::Select() { // Call the parent's Select() member to trigger accessibility events. @@ -145,7 +143,6 @@ void SvxLineBox::Select() } - bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) { MouseNotifyEvent nType = rNEvt.GetType(); @@ -176,7 +173,6 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) } - bool SvxLineBox::Notify( NotifyEvent& rNEvt ) { bool bHandled = LineLB::Notify( rNEvt ); @@ -203,7 +199,6 @@ bool SvxLineBox::Notify( NotifyEvent& rNEvt ) } - void SvxLineBox::ReleaseFocus_Impl() { if(!bRelease) @@ -271,7 +266,6 @@ SvxMetricField::SvxMetricField( } - void SvxMetricField::Update( const XLineWidthItem* pItem ) { if ( pItem ) @@ -284,7 +278,6 @@ void SvxMetricField::Update( const XLineWidthItem* pItem ) } - void SvxMetricField::Modify() { MetricField::Modify(); @@ -302,7 +295,6 @@ void SvxMetricField::Modify() } - void SvxMetricField::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) @@ -349,7 +341,6 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) } - bool SvxMetricField::Notify( NotifyEvent& rNEvt ) { bool bHandled = MetricField::Notify( rNEvt ); @@ -438,7 +429,6 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) } - bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) { bool bHandled = FillTypeLB::Notify( rNEvt ); @@ -472,7 +462,6 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) } - void SvxFillTypeBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) @@ -508,7 +497,6 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) } - bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { bool bHandled = FillAttrLB::Notify( rNEvt ); @@ -539,14 +527,12 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) } - void SvxFillAttrBox::Select() { FillAttrLB::Select(); } - void SvxFillAttrBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 6f63ff9d894e..74d355e0973d 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -95,14 +95,12 @@ const long TableWindow::TABLE_CELLS_HORIZ = 10; const long TableWindow::TABLE_CELLS_VERT = 15; - IMPL_LINK_NOARG_TYPED(TableWindow, SelectHdl, Button*, void) { CloseAndShowTableDialog(); } - TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ) @@ -149,7 +147,6 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri } - TableWindow::~TableWindow() { disposeOnce(); @@ -174,7 +171,6 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt ) } - void TableWindow::KeyInput( const KeyEvent& rKEvt ) { bool bHandled = false; @@ -248,7 +244,6 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) } - void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) { SfxPopupWindow::MouseButtonUp( rMEvt ); @@ -256,7 +251,6 @@ void TableWindow::MouseButtonUp( const MouseEvent& rMEvt ) } - void TableWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { const long nSelectionWidth = mnTablePosX + nCol * mnTableCellWidth; @@ -331,7 +325,6 @@ void TableWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void TableWindow::PopupModeEnd() { if ( !IsPopupModeCanceled() && nCol && nLine ) @@ -349,7 +342,6 @@ void TableWindow::PopupModeEnd() } - void TableWindow::Update( long nNewCol, long nNewLine ) { if ( nNewCol < 0 || nNewCol > TABLE_CELLS_HORIZ ) @@ -367,7 +359,6 @@ void TableWindow::Update( long nNewCol, long nNewLine ) } - void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) { Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY ); @@ -385,7 +376,6 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) } - void TableWindow::CloseAndShowTableDialog() { // close the toolbar tool @@ -425,7 +415,6 @@ public: }; - ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), bInitialKeyInput(true), @@ -461,7 +450,6 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri } - void ColumnsWindow::MouseMove( const MouseEvent& rMEvt ) { SfxPopupWindow::MouseMove( rMEvt ); @@ -602,7 +590,6 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) } - void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) { SfxPopupWindow::MouseButtonUp( rMEvt ); @@ -613,7 +600,6 @@ void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt ) } - void ColumnsWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { long i; @@ -674,7 +660,6 @@ void ColumnsWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) } - void ColumnsWindow::PopupModeEnd() { if ( !IsPopupModeCanceled() && nCol ) @@ -703,13 +688,11 @@ SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n } - SvxTableToolBoxControl::~SvxTableToolBoxControl() { } - VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow() { if ( bEnabled ) @@ -750,13 +733,11 @@ SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt } - SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl() { } - VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow() { ColumnsWindow* pWin = nullptr; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index c617a7c8b08b..e5e83d60f42a 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -216,7 +216,6 @@ IMPL_LINK_NOARG_TYPED(SvxListBoxControl, SelectHdl, ListBox&, void) } - SFX_IMPL_TOOLBOX_CONTROL( SvxUndoRedoControl, SfxStringItem ); SvxUndoRedoControl::SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 314b95fc3efa..04067466e721 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -63,7 +63,6 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, } - SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl() { delete pStyleItem; @@ -71,7 +70,6 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl() } - void SvxLineStyleToolBoxControl::StateChanged ( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) @@ -114,7 +112,6 @@ void SvxLineStyleToolBoxControl::StateChanged ( } - void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) { if ( pState && bUpdate ) @@ -182,7 +179,6 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) } - VclPtr<vcl::Window> SvxLineStyleToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return VclPtr<SvxLineBox>::Create( pParent, m_xFrame ).get(); @@ -196,13 +192,11 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( } - SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl() { } - void SvxLineWidthToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -243,7 +237,6 @@ void SvxLineWidthToolBoxControl::StateChanged( } - VclPtr<vcl::Window> SvxLineWidthToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return VclPtr<SvxMetricField>::Create( pParent, m_xFrame ).get(); @@ -386,7 +379,6 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void) } - void SvxLineEndWindow::FillValueSet() { if( pLineEndList.is() ) @@ -437,7 +429,6 @@ void SvxLineEndWindow::FillValueSet() } - void SvxLineEndWindow::Resize() { // since we change the size inside this call, check if we @@ -463,7 +454,6 @@ void SvxLineEndWindow::Resize() } - void SvxLineEndWindow::Resizing( Size& rNewSize ) { Size aBitmapSize = aBmpSize; // -> Member @@ -517,14 +507,12 @@ void SvxLineEndWindow::StartSelection() } - bool SvxLineEndWindow::Close() { return SfxPopupWindow::Close(); } - void SvxLineEndWindow::StateChanged( sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState ) { @@ -547,7 +535,6 @@ void SvxLineEndWindow::StateChanged( } - void SvxLineEndWindow::PopupModeEnd() { if ( IsVisible() ) @@ -559,7 +546,6 @@ void SvxLineEndWindow::PopupModeEnd() } - void SvxLineEndWindow::SetSize() { //if( !bPopupMode ) @@ -607,13 +593,11 @@ SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt } - SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl() { } - VclPtr<SfxPopupWindow> SvxLineEndToolBoxControl::CreatePopupWindow() { SvxLineEndWindow* pLineEndWin = @@ -628,7 +612,6 @@ VclPtr<SfxPopupWindow> SvxLineEndToolBoxControl::CreatePopupWindow() } - void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { sal_uInt16 nId = GetId(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6333bb8c34cd..74ae6157d032 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2906,7 +2906,6 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, } - static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) { Size aSize = rValueSet.CalcWindowSizePixel( aItemSize ); diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 0ccfbd692ebf..f134cf152d9b 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -143,7 +143,6 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl() } - void SvxFontSizeBox_Impl::Select() { FontSizeBox::Select(); @@ -167,7 +166,6 @@ void SvxFontSizeBox_Impl::Select() } - void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) { if ( !bErase ) @@ -189,7 +187,6 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) } - void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFont ) { // Sizes-Liste auff"ullen @@ -215,7 +212,6 @@ void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFo } - bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index f70805cce61b..5795e999f967 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; - SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), @@ -53,7 +52,6 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx } - void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { @@ -67,7 +65,6 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, } - void SvxTbxCtlDraw::toggleToolbox() { Reference< XLayoutManager > xLayoutMgr = getLayoutManager(); @@ -91,7 +88,6 @@ void SvxTbxCtlDraw::toggleToolbox() } - void SvxTbxCtlDraw::Select(sal_uInt16 /*nSelectModifier*/) { toggleToolbox(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 054e5fdc2cac..75efdc5ef831 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -340,9 +340,6 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 } - - - DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping , sal_Int16 nConversionPropertyType , bool bNewEntry ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index a639496ec4c1..1f45935ec7a6 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -36,7 +36,6 @@ namespace textconversiondlgs { - /** This class provides the chinese translation dialog as an uno component. It can be created via lang::XMultiComponentFactory::createInstanceWithContext diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 826fb1521437..7290c127d7e7 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -29,7 +29,6 @@ namespace textconversiondlgs { - /** */ class ChineseDictionaryDialog; diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index cef93f16b146..d69f682b8854 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -109,7 +109,6 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const } - void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 183164370308..32dca96a0de0 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -91,7 +91,6 @@ namespace svx } - class NamespaceIteratorImpl { private: @@ -116,7 +115,6 @@ namespace svx using namespace ::svx; - NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { mpPool = pPool; @@ -183,7 +181,6 @@ bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL ) } - NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ) : mpWhichIds( pWhichIds ), mpPool( pPool ) { diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 1067674f17ec..6ff4621b2635 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -242,7 +242,6 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) } - class SvxUnoXColorTable : public SvxUnoXPropertyTable { public: @@ -304,7 +303,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( } - class SvxUnoXLineEndTable : public SvxUnoXPropertyTable { public: @@ -377,7 +375,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceName } - class SvxUnoXDashTable : public SvxUnoXPropertyTable { public: @@ -458,7 +455,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( } - class SvxUnoXHatchTable : public SvxUnoXPropertyTable { public: @@ -534,7 +530,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( } - class SvxUnoXGradientTable : public SvxUnoXPropertyTable { public: @@ -622,7 +617,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNam } - class SvxUnoXBitmapTable : public SvxUnoXPropertyTable { public: diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 1609a3d7872e..025f9e4bac5b 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -180,7 +180,6 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL& } - static OUString GetCrashConfigDir() { @@ -200,7 +199,6 @@ static OUString GetCrashConfigDir() } - #if defined(WNT) #define LCKFILE "crashdat.lck" #else @@ -215,7 +213,6 @@ static OUString GetUnsentURL() } - static bool delete_pending_crash() { OUString aUnsentURL = GetUnsentURL(); diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 316887c22a70..9b3367d1ba65 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -87,8 +87,6 @@ public: }; - - class SvxTableShape : public SvxShape { protected: diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 4a3c961b14f6..d21db1a3ce6a 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -26,8 +26,6 @@ #include <svx/svdpool.hxx> - - using namespace ::osl; using namespace ::cppu; using namespace sdr::table; @@ -49,7 +47,6 @@ SvxTableShape::~SvxTableShape() throw() } - bool SvxTableShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index cc7ce2f0e6fc..e3c1c48bbde7 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -93,5 +93,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrMo } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index fc1b394851c8..2e565a428de4 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -92,5 +92,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoGradientTable_createInstance( S } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 4d182766ea31..eed5c1c9425b 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -90,5 +90,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoHatchTable_createInstance( SdrM } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 29f5d6c78dc6..456ae108c559 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -735,5 +735,4 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 29355e1d1b81..aea0bd644884 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -437,5 +437,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( Sdr } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 98472cf36e4f..0d868a51d8ea 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -899,7 +899,6 @@ SvxUnoPropertyMapProvider& getSvxMapProvider() } - SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() { for(sal_uInt16 i=0;i<SVXMAP_END; i++) @@ -916,7 +915,6 @@ SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() } - const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) { DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" ); @@ -1272,7 +1270,6 @@ static const sal_uInt16 SvxUnoColorNameResId[] = }; - bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw (std::exception) { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't @@ -1368,7 +1365,6 @@ OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rA } - comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) throw() { SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 60c6a49e450b..531ea531b61c 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -153,7 +153,6 @@ void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) throw(uno } - awt::Size SAL_CALL SvxShapeGroup::getSize() throw(uno::RuntimeException, std::exception) { return SvxShape::getSize(); @@ -378,7 +377,6 @@ SvxShapeConnector::~SvxShapeConnector() throw() } - uno::Any SAL_CALL SvxShapeConnector::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { @@ -441,7 +439,6 @@ void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) throw } - awt::Size SAL_CALL SvxShapeConnector::getSize() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getSize(); @@ -455,7 +452,6 @@ void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize ) } - // XConnectorShape void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType ) throw( uno::RuntimeException, std::exception ) @@ -595,7 +591,6 @@ void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) throw(u } - awt::Size SAL_CALL SvxShapeControl::getSize() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getSize(); @@ -1056,7 +1051,6 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c } - bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -1165,7 +1159,6 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo } - bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, @@ -1241,8 +1234,6 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx } - - void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1287,7 +1278,6 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() } - bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -1330,7 +1320,6 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con } - bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -1369,8 +1358,6 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con } - - void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(uno::RuntimeException) { ::SolarMutexGuard aGuard; @@ -1657,7 +1644,6 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte } - SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw() : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CAPTION), getSvxMapProvider().GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -1678,14 +1664,12 @@ SvxCustomShape::~SvxCustomShape() throw() } - void SvxCustomShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) { SvxShapeText::Create( pNewObj, pNewPage ); } - uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { @@ -1712,7 +1696,6 @@ void SAL_CALL SvxCustomShape::release() throw ( ) } - uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes() throw (uno::RuntimeException, std::exception) { @@ -1822,7 +1805,6 @@ void SAL_CALL SvxCustomShape::setPosition( const awt::Point& Position ) throw(un } - awt::Size SAL_CALL SvxCustomShape::getSize() throw(uno::RuntimeException, std::exception) { return SvxShapeText::getSize(); @@ -1836,8 +1818,6 @@ void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize ) } - - void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 09a7c6579f3b..9f5128f7789c 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -202,7 +202,6 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount() } - uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -243,7 +242,6 @@ sal_Bool SAL_CALL Svx3DSceneObject::hasElements() } - static bool ConvertHomogenMatrixToObject( E3dObject* pObject, const Any& rValue ) { drawing::HomogenMatrix m; @@ -415,7 +413,6 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte } - bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue) throw (css::beans::UnknownPropertyException, @@ -539,7 +536,6 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem } - bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) @@ -608,7 +604,6 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() } - bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -654,7 +649,6 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt } - bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) @@ -806,7 +800,6 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& } - bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -920,7 +913,6 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() } - bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) @@ -957,7 +949,6 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI } - bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 03c85d4ce9ed..e71b916327a0 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -576,7 +576,6 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID) } - SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -649,7 +648,6 @@ bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } - SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -722,7 +720,6 @@ bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } - SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw() : SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) ) { @@ -937,7 +934,6 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } - bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 0b682a624cbf..43dbfa7c4a26 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -241,14 +241,12 @@ SvxShape::~SvxShape() throw() } - void SvxShape::TakeSdrObjectOwnership() { mpImpl->mbHasSdrObjectOwnership = true; } - bool SvxShape::HasSdrObjectOwnership() const { if ( !mpImpl->mbHasSdrObjectOwnership ) @@ -259,28 +257,24 @@ bool SvxShape::HasSdrObjectOwnership() const } - void SvxShape::setShapeKind( sal_uInt32 nKind ) { mpImpl->mnObjId = nKind; } - sal_uInt32 SvxShape::getShapeKind() const { return mpImpl->mnObjId; } - void SvxShape::setMaster( SvxShapeMaster* pMaster ) { mpImpl->mpMaster = pMaster; } - uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException, std::exception) { if( mpImpl->mpMaster ) @@ -454,7 +448,6 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) } - void SvxShape::ChangeModel( SdrModel* pNewModel ) { DBG_TESTSOLARMUTEX(); @@ -488,7 +481,6 @@ void SvxShape::ChangeModel( SdrModel* pNewModel ) } - void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw() { DBG_TESTSOLARMUTEX(); @@ -725,7 +717,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() } - uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() throw(uno::RuntimeException) { @@ -1004,7 +995,6 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() } - uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId() throw (uno::RuntimeException, std::exception) { @@ -1099,7 +1089,6 @@ static bool svx_needLogicRectHack( SdrObject* pObj ) } - static Rectangle svx_getLogicRectHack( SdrObject* pObj ) { if(svx_needLogicRectHack(pObj)) @@ -1113,7 +1102,6 @@ static Rectangle svx_getLogicRectHack( SdrObject* pObj ) } - static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) { if(svx_needLogicRectHack(pObj)) @@ -1127,7 +1115,6 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect ) } - awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1248,7 +1235,6 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) } - // XNamed OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::exception) { @@ -1264,7 +1250,6 @@ OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::e } - void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -1350,7 +1335,6 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException, std::exception) } - void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener >& xListener ) throw(uno::RuntimeException, std::exception) { @@ -1358,7 +1342,6 @@ void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener } - void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException, std::exception) { mpImpl->maDisposeListeners.removeInterface(aListener); @@ -1367,7 +1350,6 @@ void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListen // XPropertySet - Reference< beans::XPropertySetInfo > SAL_CALL SvxShape::getPropertySetInfo() throw(uno::RuntimeException, std::exception) { @@ -1388,7 +1370,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL } - void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1396,7 +1377,6 @@ void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName } - void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutex ); @@ -1404,21 +1384,18 @@ void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyN } - void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } - void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" ); } - bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) { SfxItemSet aSet( mpModel->GetItemPool(), (sal_uInt16)nWID, (sal_uInt16)nWID ); @@ -1437,7 +1414,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName } - bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel ) { // check if an item with the given name and which id is inside the models @@ -1568,7 +1544,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, } - bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet ) { OUString aName = SvxUnogetInternalNameForItem((sal_Int16)nWID, rName); @@ -1619,7 +1594,6 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, } - void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -1747,7 +1721,6 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const } - uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -1758,7 +1731,6 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName ) } - uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { @@ -1817,7 +1789,6 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) } - // XMultiPropertySet void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { @@ -1879,7 +1850,6 @@ void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& } - void SvxShape::endSetPropertyValues() { mbIsMultiPropertyCall = false; @@ -1891,7 +1861,6 @@ void SvxShape::endSetPropertyValues() } - css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -1948,7 +1917,6 @@ void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUS } - uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const { DBG_TESTSOLARMUTEX(); @@ -2029,7 +1997,6 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE } - // XPropertyState beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) @@ -2555,7 +2522,6 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } - bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) @@ -2943,7 +2909,6 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } - bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) @@ -2974,7 +2939,6 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty } - bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) @@ -2995,7 +2959,6 @@ bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProp } - uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { @@ -3012,7 +2975,6 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons } - void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { @@ -3045,7 +3007,6 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) } - uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -3134,8 +3095,6 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults( } - - // XServiceInfo OUString SAL_CALL SvxShape::getImplementationName() @@ -3817,21 +3776,18 @@ void SAL_CALL SvxShape::setParent( const css::uno::Reference< css::uno::XInterfa } - /** called from the XActionLockable interface methods on initial locking */ void SvxShape::lock() { } - /** called from the XActionLockable interface methods on final unlock */ void SvxShape::unlock() { } - // XActionLockable sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException, std::exception) { @@ -3841,7 +3797,6 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException } - void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3854,7 +3809,6 @@ void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std } - void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3867,7 +3821,6 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, } - void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -3882,7 +3835,6 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::Runti } - sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3897,7 +3849,6 @@ sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (css::uno::RuntimeExcept } - /** since polygon shapes can change theire kind during editing, we have to recheck it here. Circle shapes also change theire kind, but theire all treated equal @@ -3968,7 +3919,6 @@ uno::Any SAL_CALL SvxShapeText::queryInterface( const uno::Type & rType ) } - uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -3980,7 +3930,6 @@ uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType ) } - void SAL_CALL SvxShapeText::acquire() throw() { SvxShape::acquire(); @@ -4036,7 +3985,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId() } - /** called from the XActionLockable interface methods on initial locking */ void SvxShapeText::lock() { @@ -4046,7 +3994,6 @@ void SvxShapeText::lock() } - /** called from the XActionLockable interface methods on final unlock */ void SvxShapeText::unlock() { @@ -4194,7 +4141,6 @@ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) th } - SdrObject* SdrObject::getSdrObjectFromXShape( const css::uno::Reference< css::uno::XInterface >& xInt ) { SvxShape* pSvxShape = SvxShape::getImplementation( xInt ); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index c776fa98f956..fcf13a7132d9 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -158,7 +158,6 @@ public: }; - SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText ) : maRefCount ( 0 ), mpObject ( pObject ), @@ -195,7 +194,6 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText } - SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ) : maRefCount ( 0 ), mpObject ( &rObject ), @@ -234,7 +232,6 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText } - SvxTextEditSourceImpl::~SvxTextEditSourceImpl() { DBG_ASSERT( !mbIsLocked, "text edit source was not unlocked before dispose!" ); @@ -245,7 +242,6 @@ SvxTextEditSourceImpl::~SvxTextEditSourceImpl() } - void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange ) { if( pNewRange ) @@ -254,7 +250,6 @@ void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange ) } - void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) { if( pOldRange ) @@ -262,17 +257,12 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) } - - - - void SAL_CALL SvxTextEditSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } - void SAL_CALL SvxTextEditSourceImpl::release() { if( ! osl_atomic_decrement( &maRefCount ) ) @@ -324,7 +314,6 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel ) } - void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { // #i105988 keep reference to this object @@ -522,7 +511,6 @@ void SvxTextEditSourceImpl::dispose() } - void SvxTextEditSourceImpl::SetupOutliner() { // only for UAA edit source: setup outliner equivalently as in @@ -544,7 +532,6 @@ void SvxTextEditSourceImpl::SetupOutliner() } - void SvxTextEditSourceImpl::UpdateOutliner() { // only for UAA edit source: update outliner equivalently as in @@ -566,9 +553,6 @@ void SvxTextEditSourceImpl::UpdateOutliner() } - - - SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() { bool bCreated = false; @@ -704,7 +688,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() } - SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() { if( !mpTextForwarder && HasView() ) @@ -722,7 +705,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder() } - SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() { if( mbDestroyed || mpObject == nullptr ) @@ -756,7 +738,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder() } - SvxDrawOutlinerViewForwarder* SvxTextEditSourceImpl::CreateViewForwarder() { if( mpView->GetTextEditOutlinerView() && mpObject ) @@ -840,7 +821,6 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate } - void SvxTextEditSourceImpl::UpdateData() { // if we have a view and in edit mode, we're working with the @@ -1039,7 +1019,6 @@ SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& } - SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl ) { mpImpl = pImpl; diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 0986195da6ad..74623d32b5cd 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -92,5 +92,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTransGradientTable_createInstan } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 9ef9262bc6db..792870fa34d9 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -61,7 +61,6 @@ GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObjec } - GalleryItem::~GalleryItem() throw() { @@ -70,14 +69,12 @@ GalleryItem::~GalleryItem() } - bool GalleryItem::isValid() const { return( mpTheme != nullptr ); } - uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -102,7 +99,6 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType ) } - uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -110,7 +106,6 @@ uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType ) } - void SAL_CALL GalleryItem::acquire() throw() { @@ -118,7 +113,6 @@ void SAL_CALL GalleryItem::acquire() } - void SAL_CALL GalleryItem::release() throw() { @@ -126,7 +120,6 @@ void SAL_CALL GalleryItem::release() } - OUString GalleryItem::getImplementationName_Static() throw() { @@ -134,7 +127,6 @@ OUString GalleryItem::getImplementationName_Static() } - uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static() throw() { @@ -183,7 +175,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId() } - sal_Int8 SAL_CALL GalleryItem::getType() throw (uno::RuntimeException, std::exception) { @@ -213,7 +204,6 @@ sal_Int8 SAL_CALL GalleryItem::getType() } - ::comphelper::PropertySetInfo* GalleryItem::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -400,10 +390,6 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt } - - - - void GalleryItem::implSetInvalid() { if( mpTheme ) @@ -424,7 +410,6 @@ GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc ) } - GalleryDrawingModel::~GalleryDrawingModel() throw() { @@ -432,7 +417,6 @@ GalleryDrawingModel::~GalleryDrawingModel() } - UNO3_GETIMPLEMENTATION_IMPL( GalleryDrawingModel ); } diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 085cdb118958..43c3cee87ee9 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -52,7 +52,6 @@ GalleryTheme::GalleryTheme( const OUString& rThemeName ) } - GalleryTheme::~GalleryTheme() { const SolarMutexGuard aGuard; @@ -71,7 +70,6 @@ GalleryTheme::~GalleryTheme() } - OUString GalleryTheme::getImplementationName_Static() throw() { @@ -79,7 +77,6 @@ OUString GalleryTheme::getImplementationName_Static() } - uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static() throw() { @@ -127,7 +124,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() } - uno::Type SAL_CALL GalleryTheme::getElementType() throw (uno::RuntimeException, std::exception) { @@ -135,7 +131,6 @@ uno::Type SAL_CALL GalleryTheme::getElementType() } - sal_Bool SAL_CALL GalleryTheme::hasElements() throw (uno::RuntimeException, std::exception) { @@ -145,7 +140,6 @@ sal_Bool SAL_CALL GalleryTheme::hasElements() } - sal_Int32 SAL_CALL GalleryTheme::getCount() throw (uno::RuntimeException, std::exception) { @@ -155,7 +149,6 @@ sal_Int32 SAL_CALL GalleryTheme::getCount() } - uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -181,7 +174,6 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) } - OUString SAL_CALL GalleryTheme::getName( ) throw (uno::RuntimeException, std::exception) { @@ -195,7 +187,6 @@ OUString SAL_CALL GalleryTheme::getName( ) } - void SAL_CALL GalleryTheme::update( ) throw (uno::RuntimeException, std::exception) { @@ -209,7 +200,6 @@ void SAL_CALL GalleryTheme::update( ) } - ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex( const OUString& rURL, ::sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) @@ -242,7 +232,6 @@ void SAL_CALL GalleryTheme::update( ) } - ::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) @@ -270,7 +259,6 @@ void SAL_CALL GalleryTheme::update( ) } - ::sal_Int32 SAL_CALL GalleryTheme::insertDrawingByIndex( const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException, std::exception) @@ -326,7 +314,6 @@ void SAL_CALL GalleryTheme::update( ) } - void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { @@ -342,7 +329,6 @@ void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) } - void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) { const SolarMutexGuard aGuard; @@ -379,7 +365,6 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) } - void GalleryTheme::implReleaseItems( GalleryObject* pObj ) { const SolarMutexGuard aGuard; @@ -397,10 +382,6 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj ) } - - - - void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) { const SolarMutexGuard aGuard; @@ -410,7 +391,6 @@ void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) } - void GalleryTheme::implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem ) { const SolarMutexGuard aGuard; diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index ed6ad415cd71..b21978ae047c 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -108,7 +108,6 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& } - uno::Type SAL_CALL GalleryThemeProvider::getElementType() throw (uno::RuntimeException, std::exception) { @@ -116,7 +115,6 @@ uno::Type SAL_CALL GalleryThemeProvider::getElementType() } - sal_Bool SAL_CALL GalleryThemeProvider::hasElements() throw (uno::RuntimeException, std::exception) { @@ -126,7 +124,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements() } - uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -146,7 +143,6 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName ) } - uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() throw (uno::RuntimeException, std::exception) { @@ -168,7 +164,6 @@ uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames() } - sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) throw (uno::RuntimeException, std::exception) { @@ -183,7 +178,6 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName ) } - uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName ) throw (container::ElementExistException, uno::RuntimeException, std::exception) { @@ -206,7 +200,6 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe } - void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) throw (container::NoSuchElementException, uno::RuntimeException, std::exception) { diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index f75376abac07..fd63e6f01dfa 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::lang; #define XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE "vnd.sun.star.GraphicObject:" - class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream> { ::osl::Mutex maMutex; diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index f1c7b8311ae8..c83c7b613978 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -176,7 +176,6 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr xTargetModel->lockControllers(); - pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ ); xGraphicResolver = pGraphicHelper; @@ -190,7 +189,6 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr } - if( 0 == nRet ) { diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index b0bf41d663aa..27d2b1a810c7 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -142,7 +142,6 @@ private: }; - SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileName, @@ -422,13 +421,11 @@ void SvxXMLXTableExportComponent::_ExportMasterStyles() {} void SvxXMLXTableExportComponent::_ExportContent() {} - SvxXMLTableEntryExporter::~SvxXMLTableEntryExporter() { } - SvxXMLColorEntryExporter::SvxXMLColorEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ) { @@ -453,7 +450,6 @@ void SvxXMLColorEntryExporter::exportEntry( const OUString& rStrName, const Any& } - SvxXMLLineEndEntryExporter::SvxXMLLineEndEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maMarkerStyle( rExport ) { @@ -469,7 +465,6 @@ void SvxXMLLineEndEntryExporter::exportEntry( const OUString& rStrName, const An } - SvxXMLDashEntryExporter::SvxXMLDashEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maDashStyle( rExport ) { @@ -485,7 +480,6 @@ void SvxXMLDashEntryExporter::exportEntry( const OUString& rStrName, const Any& } - SvxXMLHatchEntryExporter::SvxXMLHatchEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maHatchStyle( rExport ) { @@ -501,7 +495,6 @@ void SvxXMLHatchEntryExporter::exportEntry( const OUString& rStrName, const Any& } - SvxXMLGradientEntryExporter::SvxXMLGradientEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ), maGradientStyle( rExport ) { @@ -517,7 +510,6 @@ void SvxXMLGradientEntryExporter::exportEntry( const OUString& rStrName, const A } - SvxXMLBitmapEntryExporter::SvxXMLBitmapEntryExporter( SvXMLExport& rExport ) : SvxXMLTableEntryExporter( rExport ) { diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index db53d1e07b9b..0183888ac50f 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -74,11 +74,9 @@ sal_Char const sXML_np__ooo[] = "__ooo"; sal_Char const sXML_np__xlink[] = "__xlink"; - enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, stice_dash, stice_hatch, stice_gradient, stice_bitmap }; - class SvxXMLTableImportContext : public SvXMLImportContext { public: @@ -103,7 +101,6 @@ private: }; - SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ), mbOOoFormat( bOOoFormat ) @@ -322,7 +319,6 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r } - SvxXMLXTableImport::SvxXMLXTableImport( const css::uno::Reference< css::uno::XComponentContext >& rContext, const uno::Reference< XNameContainer > & rTable, diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index f2adb3164765..0817843deb1f 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -3521,7 +3521,6 @@ SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) } - /// fill attribute set item XFillAttrSetItem::XFillAttrSetItem( SfxItemSet* pItemSet ) : SfxSetItem( XATTRSET_FILL, pItemSet) diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx index dc3e741bf95a..db27fec04a2c 100644 --- a/sw/inc/ToxWhitespaceStripper.hxx +++ b/sw/inc/ToxWhitespaceStripper.hxx @@ -49,5 +49,4 @@ private: } // end namespace sw - #endif /* TOXWHITESPACESTRIPPER_HXX_ */ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 1eae331bd7c2..7e693894ce9b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -154,7 +154,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80897 , "fdo80897.docx") } - DECLARE_OOXMLEXPORT_TEST(testFdo80997, "fdo80997.docx") { // The problem was that the DOCX exporter not able to export text behind textbox, if textbox has a wrap property. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index 759ccf1327e6..59c0668fadeb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -385,9 +385,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71302, "fdo71302.docx") } - - - DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx") { uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index 5b885a6c3a1a..c36ae2a52c73 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -44,7 +44,6 @@ SwNodeNum::~SwNodeNum() } - void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule ) { OSL_ENSURE( GetNumRule() && GetTextNode(), diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index ecebc1302262..b889b8c575d5 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -204,9 +204,6 @@ void DocumentDrawModelManager::ReleaseDrawModel() } - - - const SwDrawModel* DocumentDrawModelManager::GetDrawModel() const { return mpDrawModel; diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index a249f2c82bbf..27dba28b24b5 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -561,7 +561,6 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr, } - } diff --git a/sw/source/core/doc/DocumentListsManager.cxx b/sw/source/core/doc/DocumentListsManager.cxx index 5285c8768691..d2b86ae45154 100644 --- a/sw/source/core/doc/DocumentListsManager.cxx +++ b/sw/source/core/doc/DocumentListsManager.cxx @@ -192,8 +192,6 @@ void DocumentListsManager::trackChangeOfListStyleName( const OUString& sListStyl } - - DocumentListsManager::~DocumentListsManager() { for ( std::unordered_map< OUString, SwList*, OUStringHash >::iterator diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx index ec6286afcea5..80869a6a68ad 100644 --- a/sw/source/core/doc/DocumentStateManager.cxx +++ b/sw/source/core/doc/DocumentStateManager.cxx @@ -108,8 +108,4 @@ void DocumentStateManager::SetLoaded(bool b) } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx index 18e649a0e359..2840e9b381f9 100644 --- a/sw/source/core/doc/DocumentTimerManager.cxx +++ b/sw/source/core/doc/DocumentTimerManager.cxx @@ -172,5 +172,4 @@ DocumentTimerManager::~DocumentTimerManager() {} } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 4d0bac68f47b..4976f07ca99e 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -110,7 +110,6 @@ SwListImpl::~SwListImpl() } - void SwListImpl::InsertListItem( SwNodeNum& rNodeNum, const int nLevel ) { diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index 61c64da53c9d..31d3f80317eb 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -38,7 +38,6 @@ #endif - // Structure for the mapping from old and new frame formats to the // boxes and lines of a table struct _MapTableFrameFormat diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index cd54815d2ea0..cd3f5674c200 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1720,7 +1720,6 @@ void SwPostItField::SetName(const OUString& rName) } - void SwPostItField::SetTextObject( OutlinerParaObject* pText ) { delete mpText; diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 973ad932586b..572ca7f2630c 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1146,7 +1146,6 @@ void SwInputField::SetFormatField( SwFormatField& rFormatField ) } - void SwInputField::LockNotifyContentChange() { if ( GetFormatField() != nullptr ) diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index ee31b1bb0f05..5d16e5fcb823 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -125,9 +125,6 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const } - - - bool SwDropDownField::SetSelectedItem(const OUString & rItem) { vector<OUString>::const_iterator aIt = diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index ff0df5e38a84..07a0fb71dab9 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -112,9 +112,6 @@ void SwAnchoredObject::SetDrawObj( SdrObject& _rDrawObj ) } - - - void SwAnchoredObject::ChgAnchorFrame( SwFrame* _pNewAnchorFrame ) { mpAnchorFrame = _pNewAnchorFrame; @@ -145,7 +142,6 @@ SwFrame* SwAnchoredObject::GetAnchorFrameContainingAnchPos() } - void SwAnchoredObject::SetPageFrame( SwPageFrame* _pNewPageFrame ) { if ( mpPageFrame != _pNewPageFrame ) diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 450444911fe1..4bebebc673cb 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -36,7 +36,6 @@ #include <IDocumentStylePoolAccess.hxx> - SwTextCharFormat::SwTextCharFormat( SwFormatCharFormat& rAttr, sal_Int32 nStt, sal_Int32 nEnde ) : SwTextAttr( rAttr, nStt ) diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 2b1827560566..dc870e8ee757 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1640,7 +1640,6 @@ struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration }; - SwXParaFrameEnumeration* SwXParaFrameEnumeration::Create(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat) { return new SwXParaFrameEnumerationImpl(rPaM, eParaFrameMode, pFormat); } diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index c1d2f612f248..6dddab0189a1 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -914,7 +914,6 @@ void SwFltAnchor::SetFrameFormat(SwFrameFormat * _pFrameFormat) } - bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const { return pFrameFormat == static_cast<const SwFltAnchor&>(rItem).pFrameFormat; diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 6bb6f54870b5..cfc0fada5d4e 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -120,13 +120,6 @@ void WW8TableNodeInfoInner::setRect(const SwRect & rRect) } - - - - - - - const SwNode * WW8TableNodeInfoInner::getNode() const { const SwNode * pResult = nullptr; @@ -352,8 +345,6 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() } - - #ifdef DBG_UTIL ::std::string WW8TableNodeInfoInner::toString() const { @@ -1472,8 +1463,6 @@ void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) } - - CellInfo::CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo) : m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFormatFrameWidth(0) { diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index bdeb1946833d..454d04a86c05 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -704,7 +704,6 @@ WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw() } - void WW8FieldEntry::SetBookmarkName(const OUString& bookmarkName) { msBookmarkName=bookmarkName; diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 961cd9de1b1c..bde14924de23 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -327,7 +327,6 @@ public: }; - static bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT ) { xLBT->startRecursiveCall( new ORecursiveCall , 50 ); @@ -1243,8 +1242,6 @@ Sequence< OUString > TestBridgeImpl::getSupportedServiceNames() } - - static Reference< XInterface > SAL_CALL TestBridgeImpl_create( const Reference< XComponentContext > & xContext ) { diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx index a093eb0f6003..abb082e3fd24 100644 --- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx +++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx @@ -277,7 +277,6 @@ static bool testAny(Type* typ, Object* value, XBridgeTest* xLBT ) } - static bool performAnyTest(XBridgeTest* xLBT, TestDataElements* data) { bool bReturn = true; @@ -331,8 +330,6 @@ static bool performSequenceOfCallTest(XBridgeTest* xLBT) } - - static bool performRecursiveCallTest(XBridgeTest* xLBT) { xLBT->startRecursiveCall(new ORecursiveCall(), 50); @@ -812,7 +809,6 @@ static bool raiseException(XBridgeTest* xLBT ) } - int run( String* args[] ) { try diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx index fca1fe46e77f..262ba7dc9d01 100644 --- a/testtools/source/bridgetest/cppobj.cxx +++ b/testtools/source/bridgetest/cppobj.cxx @@ -488,7 +488,6 @@ Any Test_Impl::transportAny( const Any & value ) throw ( css::uno::RuntimeExcept } - namespace { void wait(sal_Int32 microSeconds) { @@ -1166,8 +1165,6 @@ Sequence< OUString > Test_Impl::getSupportedServiceNames() } - - static Reference< XInterface > SAL_CALL Test_Impl_create( SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & ) { diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx index 3b8a04d4b11d..ca0582e24e4b 100644 --- a/testtools/source/performance/ubobject.cxx +++ b/testtools/source/performance/ubobject.cxx @@ -199,7 +199,6 @@ public: }; - // XServiceInfo OUString ServiceImpl::getImplementationName() @@ -221,8 +220,6 @@ Sequence< OUString > ServiceImpl::getSupportedServiceNames() } - - static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMultiServiceFactory > & xSMgr ) { return Reference< XInterface >( (XPerformanceTest *)new ServiceImpl( xSMgr ) ); @@ -231,11 +228,6 @@ static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMu } - - - - - extern "C" { sal_Bool SAL_CALL component_writeInfo( diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx index 2b1c83401de6..f1351132ea0a 100644 --- a/testtools/source/performance/ubtest.cxx +++ b/testtools/source/performance/ubtest.cxx @@ -422,8 +422,6 @@ public: }; - - TestImpl::TestImpl( const Reference< XMultiServiceFactory > & xSMgr ) : _xSMgr( xSMgr ) { @@ -1026,7 +1024,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) TimingSheet aDirect; - if (aArg.indexOf( 'd' ) >= 0) { // in process direct test @@ -1037,7 +1034,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) } - if (aArg.indexOf( 'm' ) >= 0) { // in process uno dispatch @@ -1068,7 +1064,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) } - if (aArg.indexOf( 's' ) >= 0) { // start server process @@ -1136,7 +1131,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) } - if (aArg.indexOf( 'r' ) >= 0) { // remote @@ -1155,7 +1149,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) } - if (aArg.indexOf( 'j' ) >= 0) { // java @@ -1256,11 +1249,6 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs ) } - - - - - extern "C" { diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx index bbe53a474782..3b5ae6a1c171 100644 --- a/toolkit/inc/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx @@ -51,7 +51,6 @@ public: }; - #endif // INCLUDED_TOOLKIT_INC_HELPER_UNOPROPERTYARRAYHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx index 7237ede2ef19..6e21c41c02f3 100644 --- a/toolkit/source/awt/stylesettings.hxx +++ b/toolkit/source/awt/stylesettings.hxx @@ -38,7 +38,6 @@ namespace toolkit { - //= WindowStyleSettings struct WindowStyleSettings_Data; diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 2fd56d4c5f16..1d09acb2c378 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -56,7 +56,6 @@ IMPL_XTYPEPROVIDER_START( VCLXRegion ) IMPL_XTYPEPROVIDER_END - css::awt::Rectangle VCLXRegion::getBounds() throw(css::uno::RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -165,5 +164,4 @@ css::uno::Sequence< css::awt::Rectangle > VCLXRegion::getRectangles() throw(css: } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index a1f4bb3ac7ad..2b563b47805f 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -315,8 +315,6 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() } - - // Uses an out-parameter instead of return value, due to the object reference void ImplInitWindowEvent( css::awt::WindowEvent& rEvent, vcl::Window* pWindow ) @@ -914,8 +912,6 @@ VCLXWindow* VCLXWindow::GetImplementation( const css::uno::Reference< css::uno:: } - - // css::lang::Component void VCLXWindow::dispose( ) throw(css::uno::RuntimeException, std::exception) { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index fe3d05b455a4..53ccd5184750 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -749,7 +749,6 @@ css::uno::Any VCLXImageControl::getProperty( const OUString& PropertyName ) thro // class VCLXCheckBox - void VCLXCheckBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { PushPropertyIds( rIds, @@ -1464,7 +1463,6 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } - // class VCLXListBox void VCLXListBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) @@ -2416,7 +2414,6 @@ throw(css::uno::RuntimeException, std::exception) } - // class VCLXTabPage VCLXMultiPage::VCLXMultiPage() : maTabListeners( *this ), mTabId( 1 ) @@ -3741,7 +3738,6 @@ css::awt::Size SAL_CALL VCLXScrollBar::getMinimumSize() throw(css::uno::RuntimeE } - // class VCLXEdit @@ -4720,7 +4716,6 @@ css::uno::Any VCLXFormattedSpinField::getProperty( const OUString& PropertyName } - // class VCLXDateField @@ -5070,7 +5065,6 @@ sal_Bool VCLXDateField::isStrictFormat() throw(css::uno::RuntimeException, std:: } - // class VCLXTimeField @@ -5973,7 +5967,6 @@ css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName ) throw } - // class VCLXCurrencyField diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index bc6a1b6aece6..420f34fddae3 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -582,7 +582,6 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any& } - if ( aName.isEmpty() || !xM.is() ) lcl_throwIllegalArgumentException(); @@ -927,7 +926,6 @@ void ControlModelContainerBase::implNotifyTabModelChange( const OUString& _rAcce } - void ControlModelContainerBase::implUpdateGroupStructure() { if ( mbGroupsUpToDate ) @@ -1344,7 +1342,6 @@ throw ( RuntimeException, std::exception ) } - // class DialogContainerControl ControlContainerBase::ControlContainerBase( const Reference< XComponentContext >& rxContext ) diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index b480f5eedfff..64c7d8a6e13b 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -185,7 +185,6 @@ void NameContainer_Impl::removeContainerListener( const css::uno::Reference< css } - // Ctor ScriptEventContainer::ScriptEventContainer() : NameContainer_Impl( cppu::UnoType<ScriptEventDescriptor>::get()) @@ -195,6 +194,4 @@ ScriptEventContainer::ScriptEventContainer() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index c0707d1d97ea..79da293067ae 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -439,7 +439,6 @@ //= OCommonGeometryControlModel - typedef std::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; typedef std::vector< css::uno::Sequence< css::beans::Property > > PropSeqArray; typedef std::vector< ::std::vector< sal_Int32 > > IntArrayArray; @@ -463,7 +462,6 @@ // service specifier. - OCommonGeometryControlModel::OCommonGeometryControlModel( Reference< XCloneable >& _rxAgg, const OUString& _rServiceSpecifier ) :OGeometryControlModel_Base( _rxAgg ) ,m_sServiceSpecifier( _rServiceSpecifier ) diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index a3991bcfb2c4..773bf22f4476 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -269,7 +269,6 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(Runtime } - //= UnoGridControl UnoGridControl::UnoGridControl() diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx index 32a34c4d9073..e7e9cb7db709 100644 --- a/toolkit/source/controls/grid/gridcontrol.hxx +++ b/toolkit/source/controls/grid/gridcontrol.hxx @@ -80,7 +80,6 @@ public: }; - // = UnoGridControl typedef ::cppu::ImplInheritanceHelper < UnoControlBase diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx index d9c30bf396c2..75d84c0f0c75 100644 --- a/toolkit/source/controls/grid/initguard.hxx +++ b/toolkit/source/controls/grid/initguard.hxx @@ -29,7 +29,6 @@ namespace toolkit { - //= InitGuard template < class IMPL > diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 4b13004d243d..aaf8ee27effc 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -147,7 +147,6 @@ static void lcl_throwIndexOutOfBoundsException( ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, UnoControlRoadmapModel_IBase ) - css::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); @@ -157,7 +156,6 @@ static void lcl_throwIndexOutOfBoundsException( ) } - ::cppu::IPropertyArrayHelper& UnoControlRoadmapModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = nullptr; @@ -194,7 +192,6 @@ static void lcl_throwIndexOutOfBoundsException( ) } - void UnoControlRoadmapModel::MakeRMItemValidation( sal_Int32 Index, Reference< XInterface > xRoadmapItem ) { if ((Index > (sal_Int32)maRoadmapItems.size()) || ( Index < 0 ) ) @@ -300,7 +297,6 @@ static void lcl_throwIndexOutOfBoundsException( ) } - void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { @@ -401,14 +397,12 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& } - OUString UnoRoadmapControl::GetComponentServiceName() { return OUString("Roadmap"); } - void UnoRoadmapControl::dispose() throw(RuntimeException, std::exception) { EventObject aEvt; @@ -418,7 +412,6 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& } - void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException, std::exception) { Reference< XInterface > xRoadmapItem; diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index 1bfb4565a6b6..2327d0248690 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -49,8 +49,6 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( ) & m_bInteractive, cppu::UnoType<decltype(m_bInteractive)>::get() ); - - // Note that the list of registered properties has to be fixed: Different // instances of this class have to register the same set of properties with // the same attributes. diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index f9c0f9c0d154..184d56c0fdcf 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -88,7 +88,6 @@ void UnoControlModelEntryList::insert( size_t i, UnoControlModelEntry* item ) { } - // class StdTabControllerModel StdTabControllerModel::StdTabControllerModel() diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 150f911a1cf4..46b2f0ada958 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -100,7 +100,6 @@ namespace toolkit } - //= UnoControlScrollBarModel UnoScrollBarControl::UnoScrollBarControl() diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index ffc9109822e8..495a30f6da61 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -213,14 +213,12 @@ sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (Illegal } - Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelection(); } - void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); @@ -233,7 +231,6 @@ void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSele } - void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { if( getPeer().is() && (maSelectionListeners.getLength() == 1) ) @@ -255,35 +252,30 @@ sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (I } - void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->removeSelection(rSelection); } - void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->clearSelection(); } - sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelectionCount(); } - Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createSelectionEnumeration(); } - Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createReverseSelectionEnumeration(); @@ -299,70 +291,60 @@ OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeE } - void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultExpandedGraphicURL(_defaultexpansiongraphicurl); } - OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultCollapsedGraphicURL(); } - void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultCollapsedGraphicURL(_defaultcollapsedgraphicurl); } - sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeExpanded(xNode); } - sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeCollapsed(xNode); } - void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->makeNodeVisible(xNode); } - sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeVisible(xNode); } - void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->expandNode(xNode); } - void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->collapseNode(xNode); } - void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.addInterface( xListener ); @@ -375,7 +357,6 @@ void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeEx } - void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) ) @@ -388,56 +369,48 @@ void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTre } - Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeForLocation(x,y); } - Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getClosestNodeForLocation(x,y); } - awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeRect( Node ); } - sal_Bool SAL_CALL UnoTreeControl::isEditing( ) throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isEditing(); } - sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException, std::exception) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->stopEditing(); } - void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->cancelEditing(); } - void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) { Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->startEditingAtNode(xNode); } - void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) { maTreeEditListeners.addInterface( xListener ); @@ -450,7 +423,6 @@ void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditLis } - void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception) { if( getPeer().is() && (maTreeEditListeners.getLength() == 1) ) diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index e29cd7fced5b..3ded2fcead43 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -255,5 +255,4 @@ void UnoControlBase::Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLine } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 895cc79d4aa5..2315d87fdcdc 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -352,7 +352,6 @@ void implUpdateVisibility } - // class DialogStepChangedListener typedef ::cppu::WeakImplHelper< beans::XPropertyChangeListener > PropertyChangeListenerHelper; @@ -706,7 +705,6 @@ void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >& } - // awt::XUnoControlContainer void UnoControlContainer::setTabControllers( const uno::Sequence< uno::Reference< awt::XTabController > >& TabControllers ) throw(uno::RuntimeException, std::exception) { diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 8a0f22a31dd9..fd711d1cd3c3 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1356,7 +1356,6 @@ void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& r } - void UnoControlModel::ImplNormalizePropertySequence( const sal_Int32, sal_Int32*, uno::Any*, sal_Int32* ) const { diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index 13c82aa32e6a..d2029abc78ff 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -39,7 +39,6 @@ css::uno::Any ListenerMultiplexerBase::queryInterface( const css::uno::Type & rT } - // class EventListenerMultiplexer EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource ) diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 7a7265ca33f8..ca81a1e5b850 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -393,5 +393,4 @@ bool CompareProperties( const css::uno::Any& r1, const css::uno::Any& r2 ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index f82b37c6a8f8..ef61d4a2150e 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -391,6 +391,4 @@ namespace tools_urlobj } // namespace rtl_random - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 6ed448d1500d..b04fc17d6a1e 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -1028,7 +1028,6 @@ inline INetMIMEEncodedWordOutputSink::INetMIMEEncodedWordOutputSink( } - inline void INetMIMEEncodedWordOutputSink::write(const sal_Unicode * pBegin, const sal_Unicode * pEnd) { diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index 22d3dfe01f24..de16eaa486c5 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -80,5 +80,4 @@ OUString ResId::toString() const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index b2f04092bb37..595422c2f635 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -110,11 +110,9 @@ template<typename T> T CachedContentResultSet::rowOriginGet( } - // CCRS_Cache methods - CachedContentResultSet::CCRS_Cache::CCRS_Cache( const Reference< XContentIdentifierMapping > & xMapping ) : m_pResult( nullptr ) @@ -367,11 +365,9 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache } - // class CCRS_PropertySetInfo - class CCRS_PropertySetInfo : public cppu::OWeakObject, public css::lang::XTypeProvider, @@ -660,11 +656,9 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo } - // class CachedContentResultSet - CachedContentResultSet::CachedContentResultSet( const Reference< XComponentContext > & rxContext , const Reference< XResultSet > & xOrigin @@ -827,11 +821,9 @@ bool SAL_CALL CachedContentResultSet }; - //define for fetching data - #define FETCH_XXX( aCache, fetchInterface, fetchMethod ) \ bool bDirection = !!( \ nFetchDirection != FetchDirection::REVERSE ); \ @@ -2200,11 +2192,9 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter() } - // class CachedContentResultSetFactory - CachedContentResultSetFactory::CachedContentResultSetFactory( const Reference< XComponentContext > & rxContext ) { diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index ba5c80d5fdbb..3e8d274b824a 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -33,7 +33,6 @@ #define CACHED_CONTENT_RESULTSET_FACTORY_NAME "com.sun.star.ucb.CachedContentResultSetFactory" - namespace com { namespace sun { namespace star { namespace script { class XTypeConverter; } } } } @@ -126,7 +125,6 @@ class CachedContentResultSet CCRS_PropertySetInfo* m_pMyPropSetInfo; - css::uno::Reference< css::ucb::XContentIdentifierMapping > m_xContentIdentifierMapping;// can be used for remote optimized ContentAccess @@ -159,7 +157,6 @@ private: virtual void SAL_CALL impl_initPropertySetInfo() override; - bool SAL_CALL applyPositionToOrigin( sal_Int32 nRow ) throw( css::sdbc::SQLException, @@ -465,7 +462,6 @@ private: }; - class CachedContentResultSetFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index aa0d9ce01a0b..7f7092fc9fbe 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -490,11 +490,9 @@ FetchResult SAL_CALL CachedContentResultSetStub } - // class CachedContentResultSetStubFactory - CachedContentResultSetStubFactory::CachedContentResultSetStubFactory( const Reference< XMultiServiceFactory > & rSMgr ) { diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 72fa1702b318..9157d9791c4c 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -31,7 +31,6 @@ #define CACHED_CRS_STUB_FACTORY_NAME "com.sun.star.ucb.CachedContentResultSetStubFactory" - class CachedContentResultSetStub : public ContentResultSetWrapper , public css::lang::XTypeProvider @@ -90,7 +89,6 @@ public: virtual ~CachedContentResultSetStub(); - // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; @@ -156,7 +154,6 @@ public: }; - class CachedContentResultSetStubFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 1cf3da67d0f4..add46c27eabf 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -136,11 +136,9 @@ void SAL_CALL CachedDynamicResultSet } - // class CachedDynamicResultSetFactory - CachedDynamicResultSetFactory::CachedDynamicResultSetFactory( const Reference< XComponentContext > & xContext ) { diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx index 0a65f3bd367a..4df3b2131b69 100644 --- a/ucb/source/cacher/cacheddynamicresultset.hxx +++ b/ucb/source/cacher/cacheddynamicresultset.hxx @@ -28,7 +28,6 @@ #define CACHED_DRS_FACTORY_NAME "com.sun.star.ucb.CachedDynamicResultSetFactory" - class CachedDynamicResultSet : public DynamicResultSetWrapper , public css::lang::XTypeProvider @@ -86,7 +85,6 @@ public: }; - class CachedDynamicResultSetFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 991f8eaa8d67..b75832218944 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -126,11 +126,9 @@ XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub, CACHED_DRS_STUB_SERVICE_NAME ); - // class CachedDynamicResultSetStubFactory - CachedDynamicResultSetStubFactory::CachedDynamicResultSetStubFactory( const Reference< XComponentContext > & rxContext ) { diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx index bd619cb43f28..7d46d962222a 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx @@ -27,7 +27,6 @@ #define CACHED_DRS_STUB_FACTORY_NAME "com.sun.star.ucb.CachedDynamicResultSetStubFactory" - class CachedDynamicResultSetStub : public DynamicResultSetWrapper , public css::lang::XTypeProvider @@ -75,7 +74,6 @@ public: }; - class CachedDynamicResultSetStubFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index 47c149582f60..dda278fdb99c 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { @@ -81,7 +80,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 6390550c8efd..7c5673713d66 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -36,12 +36,9 @@ using namespace com::sun::star::util; using namespace cppu; - - // class ContentResultSetWrapper - ContentResultSetWrapper::ContentResultSetWrapper( Reference< XResultSet > xOrigin ) : m_xResultSetOrigin( xOrigin ) @@ -489,7 +486,6 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper::getMetaData() } - // XPropertySet methods. // virtual @@ -1315,11 +1311,9 @@ Reference< XArray > SAL_CALL ContentResultSetWrapper::getArray( sal_Int32 column } - // class ContentResultSetWrapperListener - ContentResultSetWrapperListener::ContentResultSetWrapperListener( ContentResultSetWrapper* pOwner ) : m_pOwner( pOwner ) diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index 138856ce27d2..143e0af1ae1e 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -35,7 +35,6 @@ #include <cppuhelper/interfacecontainer.hxx> - class ContentResultSetWrapperListener; class ContentResultSetWrapper : public cppu::OWeakObject @@ -488,7 +487,6 @@ public: }; - class ContentResultSetWrapperListener : public cppu::OWeakObject , public css::beans::XPropertyChangeListener diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index b3f30b3c7115..880c78dc4c33 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -33,12 +33,9 @@ using namespace com::sun::star::uno; using namespace cppu; - - // class DynamicResultSetWrapper - DynamicResultSetWrapper::DynamicResultSetWrapper( Reference< XDynamicResultSet > xOrigin , const Reference< XComponentContext > & rxContext ) @@ -437,11 +434,9 @@ sal_Int16 SAL_CALL DynamicResultSetWrapper::getCapabilities() } - // class DynamicResultSetWrapperListener - DynamicResultSetWrapperListener::DynamicResultSetWrapperListener( DynamicResultSetWrapper* pOwner ) : m_pOwner( pOwner ) diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index e04f75875a67..287d4ff25079 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -34,7 +34,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> - class DynamicResultSetWrapperListener; class DynamicResultSetWrapper : public cppu::OWeakObject @@ -164,7 +163,6 @@ public: }; - class DynamicResultSetWrapperListener : public cppu::OWeakObject , public css::ucb::XDynamicResultSetListener diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index f412435f3e84..51ea866f1113 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -33,13 +33,9 @@ using namespace com::sun::star; using namespace ucb_cmdenv; - - // UcbCommandEnvironment Implementation. - - UcbCommandEnvironment::UcbCommandEnvironment( const uno::Reference< lang::XMultiServiceFactory >& /*xSMgr*/ ) //: m_xSMgr( xSMgr ) @@ -53,11 +49,9 @@ UcbCommandEnvironment::~UcbCommandEnvironment() } - // XInitialization methods. - // virtual void SAL_CALL UcbCommandEnvironment::initialize( const uno::Sequence< uno::Any >& aArguments ) @@ -71,11 +65,9 @@ void SAL_CALL UcbCommandEnvironment::initialize( } - // XServiceInfo methods. - // virtual OUString SAL_CALL UcbCommandEnvironment::getImplementationName() throw ( uno::RuntimeException, std::exception ) @@ -118,11 +110,9 @@ UcbCommandEnvironment::getSupportedServiceNames_Static() } - // XCommandInfo methods. - // virtual uno::Reference< task::XInteractionHandler > SAL_CALL UcbCommandEnvironment::getInteractionHandler() @@ -141,11 +131,9 @@ UcbCommandEnvironment::getProgressHandler() } - // Service factory implementation. - static uno::Reference< uno::XInterface > SAL_CALL UcbCommandEnvironment_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 438f0c8c7959..e1df4274b744 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -28,14 +28,9 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; - - - // UcbContentProviderProxyFactory Implementation. - - UcbContentProviderProxyFactory::UcbContentProviderProxyFactory( const Reference< XMultiServiceFactory >& rxSMgr ) : m_xSMgr( rxSMgr ) @@ -51,25 +46,20 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory() // XServiceInfo methods. - XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory, OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ), "com.sun.star.ucb.ContentProviderProxyFactory" ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbContentProviderProxyFactory ); - // XContentProviderFactory methods. - // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxyFactory::createContentProvider( @@ -81,13 +71,9 @@ UcbContentProviderProxyFactory::createContentProvider( } - - // UcbContentProviderProxy Implementation. - - UcbContentProviderProxy::UcbContentProviderProxy( const Reference< XMultiServiceFactory >& rxSMgr, const OUString& Service ) @@ -146,15 +132,12 @@ UcbContentProviderProxy::queryInterface( const Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy ); - Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() \ throw( RuntimeException, std::exception ) { @@ -178,11 +161,9 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() } - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy, OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ), "com.sun.star.ucb.ContentProviderProxy" ); @@ -191,7 +172,6 @@ XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy, // XContentProvider methods. - // virtual Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent( const Reference< XContentIdentifier >& Identifier ) @@ -230,11 +210,9 @@ sal_Int32 SAL_CALL UcbContentProviderProxy::compareContentIds( } - // XParameterizedContentProvider methods. - // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::registerInstance( const OUString& Template, @@ -295,11 +273,9 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template, } - // XContentProviderSupplier methods. - // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::getContentProvider() diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index 073d0ab690a8..02f916f42aa2 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -33,12 +33,9 @@ #include <cppuhelper/implbase.hxx> - - // class UcbContentProviderProxyFactory. - class UcbContentProviderProxyFactory : public cppu::WeakImplHelper < css::lang::XServiceInfo, css::ucb::XContentProviderFactory > @@ -73,11 +70,9 @@ public: }; - // class UcbContentProviderProxy. - class UcbContentProviderProxy : public cppu::OWeakObject, public css::lang::XTypeProvider, diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 5f5cff3df809..b71e30850f2c 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -221,11 +221,9 @@ bool createContentProviderData( } - // UniversalContentBroker Implementation. - UniversalContentBroker::UniversalContentBroker( const Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ), @@ -244,7 +242,6 @@ UniversalContentBroker::~UniversalContentBroker() } - // XInterface methods. void SAL_CALL UniversalContentBroker::acquire() throw() @@ -278,7 +275,6 @@ css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const css::uno::T // XTypeProvider methods. - XTYPEPROVIDER_IMPL_9( UniversalContentBroker, XUniversalContentBroker, XTypeProvider, @@ -291,11 +287,9 @@ XTYPEPROVIDER_IMPL_9( UniversalContentBroker, XCommandProcessor ); - // XComponent methods. - // virtual void SAL_CALL UniversalContentBroker::dispose() throw( css::uno::RuntimeException, std::exception ) @@ -336,29 +330,23 @@ void SAL_CALL UniversalContentBroker::removeEventListener( } - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( UniversalContentBroker, OUString( "com.sun.star.comp.ucb.UniversalContentBroker" ), UCB_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker ); - // XInitialization methods. - // virtual void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any >& aArguments ) throw( css::uno::Exception, @@ -395,11 +383,9 @@ void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any } - // XContentProviderManager methods. - // virtual Reference< XContentProvider > SAL_CALL UniversalContentBroker::registerContentProvider( @@ -523,11 +509,9 @@ Reference< XContentProvider > SAL_CALL } - // XContentProvider methods. - // virtual Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( const Reference< XContentIdentifier >& Identifier ) @@ -574,11 +558,9 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( } - // XContentIdentifierFactory methods. - // virtual Reference< XContentIdentifier > SAL_CALL UniversalContentBroker::createContentIdentifier( @@ -610,11 +592,9 @@ Reference< XContentIdentifier > SAL_CALL } - // XCommandProcessor methods. - // virtual sal_Int32 SAL_CALL UniversalContentBroker::createCommandIdentifier() throw( RuntimeException, std::exception ) @@ -712,11 +692,9 @@ Any SAL_CALL UniversalContentBroker::execute( } - // XCommandProcessor2 methods. - // virtual void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aCommandId*/) throw( RuntimeException, std::exception ) @@ -733,7 +711,6 @@ void SAL_CALL UniversalContentBroker::abort( sal_Int32 ) } - // XChangesListener methods @@ -780,7 +757,6 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& } - // XEventListener methods @@ -798,11 +774,9 @@ void SAL_CALL UniversalContentBroker::disposing(const lang::EventObject&) } - // Non-interface methods - Reference< XContentProvider > UniversalContentBroker::queryContentProvider( const OUString& Identifier, bool bResolved ) @@ -966,11 +940,9 @@ bool UniversalContentBroker::getContentProviderData( } - // ProviderListEntry_Impl implementation. - Reference< XContentProvider > ProviderListEntry_Impl::resolveProvider() const { if ( !m_xResolvedProvider.is() ) diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 10f97d50f950..2565548fdefd 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -64,11 +64,9 @@ namespace { - // struct TransferCommandContext. - struct TransferCommandContext { uno::Reference< uno::XComponentContext > m_xContext; @@ -88,11 +86,9 @@ struct TransferCommandContext }; - // class InteractionHandlerProxy. - class InteractionHandlerProxy : public cppu::WeakImplHelper< task::XInteractionHandler > { @@ -162,11 +158,9 @@ void SAL_CALL InteractionHandlerProxy::handle( } - // class ActiveDataSink. - class ActiveDataSink : public cppu::WeakImplHelper< io::XActiveDataSink > { uno::Reference< io::XInputStream > m_xStream; @@ -198,11 +192,9 @@ uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() } - // class CommandProcessorInfo. - class CommandProcessorInfo : public cppu::WeakImplHelper< ucb::XCommandInfo > { @@ -325,9 +317,6 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) } - - - OUString createDesiredName( const OUString & rSourceURL, const OUString & rNewTitle ) { @@ -526,7 +515,6 @@ uno::Reference< ucb::XContent > createNew( // (1) Obtain creatable types from target. - // First, try it using "CreatabeleContentsInfo" property and // "createNewContent" command -> the "new" way. @@ -622,11 +610,9 @@ uno::Reference< ucb::XContent > createNew( } - // (2) Try to find a matching target type for the source object. - uno::Reference< ucb::XContent > xNew; for ( sal_Int32 n = 0; n < nCount; ++n ) { @@ -696,7 +682,6 @@ uno::Reference< ucb::XContent > createNew( // (3) Create a new, empty object of matched type. - if ( !xCreator.is() ) { // First, try it using "CreatabeleContentsInfo" property and @@ -909,11 +894,9 @@ uno::Reference< io::XInputStream > getInputStream( uno::Reference< io::XInputStream > xInputStream; - // (1) Try to get data as XInputStream via XActiveDataSink. - try { uno::Reference< io::XActiveDataSink > xSink = new ActiveDataSink; @@ -948,7 +931,6 @@ uno::Reference< io::XInputStream > getInputStream( // (2) Try to get data via XOutputStream. - try { uno::Reference< io::XOutputStream > xOutputStream( io::Pipe::create(rContext.m_xContext), uno::UNO_QUERY_THROW ); @@ -1238,12 +1220,10 @@ void globalTransfer_( bool bSourceIsLink = !xSourceProps->getString( 3 ).isEmpty(); - // (1) Try to find a matching target type for the source object and // create a new, empty object of that type. - uno::Reference< ucb::XContent > xNew = createNew( rContext, xTarget, bSourceIsFolder, @@ -1267,11 +1247,9 @@ void globalTransfer_( } - // (2) Transfer property values from source to new object. - uno::Reference< ucb::XCommandProcessor > xCommandProcessorN( xNew, uno::UNO_QUERY ); if ( !xCommandProcessorN.is() ) @@ -1317,11 +1295,9 @@ void globalTransfer_( transferProperties( rContext, xCommandProcessorS, xCommandProcessorN ); - // (3) Try to obtain a data stream from source. - uno::Reference< io::XInputStream > xInputStream; if ( bSourceIsDocument && ( rContext.aArg.Operation @@ -1329,11 +1305,9 @@ void globalTransfer_( xInputStream = getInputStream( rContext, xCommandProcessorS ); - // (4) Try to obtain a resultset (children) from source. - uno::Reference< sdbc::XResultSet > xResultSet; if ( bSourceIsFolder && ( rContext.aArg.Operation @@ -1341,11 +1315,9 @@ void globalTransfer_( xResultSet = getResultSet( rContext, xCommandProcessorS ); - // (5) Insert (store) new content. - ucb::InsertCommandArgument2 aArg; aArg.Data = xInputStream; aArg.MimeType = rContext.aArg.MimeType; @@ -1538,11 +1510,9 @@ void globalTransfer_( while ( bRetry ); - // (6) Process children of source. - if ( xResultSet.is() ) { try @@ -1668,11 +1638,9 @@ void globalTransfer_( } /* namescpace */ - // UniversalContentBroker implementation ( XCommandProcessor commands ). - uno::Reference< ucb::XCommandInfo > UniversalContentBroker::getCommandInfo() { @@ -1698,11 +1666,9 @@ void UniversalContentBroker::globalTransfer( } - // (1) Try to transfer the content using 'transfer' command. - uno::Reference< ucb::XContent > xTarget; uno::Reference< ucb::XContentIdentifier > xId = createContentIdentifier( rArg.TargetURL ); @@ -1885,11 +1851,9 @@ void UniversalContentBroker::globalTransfer( } - // (2) Try to transfer the content "manually". - uno::Reference< ucb::XContent > xSource; try { @@ -1995,11 +1959,9 @@ void UniversalContentBroker::globalTransfer( globalTransfer_( aTransferCtx, xSource, xTarget, xRow ); - // (3) Delete source, if operation is MOVE. - if ( rArg.Operation == ucb::TransferCommandOperation_MOVE ) { try diff --git a/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx index 89a7d6104519..782154537818 100644 --- a/ucb/source/core/ucbcmds.hxx +++ b/ucb/source/core/ucbcmds.hxx @@ -21,11 +21,9 @@ #define INCLUDED_UCB_SOURCE_CORE_UCBCMDS_HXX - // Definitions for the commands supported by the UCB. - #define GETCOMMANDINFO_NAME "getCommandInfo" #define GETCOMMANDINFO_HANDLE 1024 diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 6f0c49bd2a85..9c3eddaf5967 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -193,29 +193,23 @@ UcbPropertiesManager::~UcbPropertiesManager() } - // XServiceInfo methods. - XSERVICEINFO_IMPL_1( UcbPropertiesManager, OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ), PROPERTIES_MANAGER_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbPropertiesManager ); - // XPropertySetInfo methods. - // virtual Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties() throw( RuntimeException, std::exception ) @@ -245,11 +239,9 @@ sal_Bool SAL_CALL UcbPropertiesManager::hasPropertyByName( const OUString& Name } - // Non-Interface methods. - bool UcbPropertiesManager::queryProperty( const OUString& rName, Property& rProp ) { diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index 5f5d257343b4..dfe8137a554a 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -29,15 +29,12 @@ #include <cppuhelper/implbase.hxx> - #define PROPERTIES_MANAGER_SERVICE_NAME "com.sun.star.ucb.PropertiesManager" - // class UcbPropertiesManager. - class UcbPropertiesManager : public cppu::WeakImplHelper < css::lang::XServiceInfo, css::beans::XPropertySetInfo > diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 8d285b8b2134..3f96e21914d6 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star::util; using namespace cppu; - OUString makeHierarchalNameSegment( const OUString & rIn ) { OUStringBuffer aBuffer; @@ -133,11 +132,9 @@ public: }; - // UcbStore_Impl. - struct UcbStore_Impl { osl::Mutex m_aMutex; @@ -146,15 +143,9 @@ struct UcbStore_Impl }; - - - // UcbStore Implementation. - - - UcbStore::UcbStore( const Reference< XComponentContext >& xContext ) : m_xContext( xContext ), m_pImpl( new UcbStore_Impl() ) @@ -173,19 +164,15 @@ XSERVICEINFO_IMPL_1_CTX( UcbStore, STORE_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbStore ); - // XPropertySetRegistryFactory methods. - // virtual Reference< XPropertySetRegistry > SAL_CALL UcbStore::createPropertySetRegistry( const OUString& ) @@ -205,11 +192,9 @@ UcbStore::createPropertySetRegistry( const OUString& ) } - // XInitialization methods. - // virtual void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments ) throw( Exception, RuntimeException, std::exception ) @@ -225,11 +210,9 @@ const Sequence< Any >& UcbStore::getInitArgs() const } - // PropertySetRegistry_Impl. - struct PropertySetRegistry_Impl { const Sequence< Any > m_aInitArgs; @@ -252,9 +235,6 @@ struct PropertySetRegistry_Impl // PropertySetRegistry Implementation. - - - PropertySetRegistry::PropertySetRegistry( const Reference< XComponentContext >& xContext, const Sequence< Any > &rInitArgs ) @@ -270,21 +250,17 @@ PropertySetRegistry::~PropertySetRegistry() } - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry, OUString( "com.sun.star.comp.ucb.PropertySetRegistry" ), PROPSET_REG_SERVICE_NAME ); - // XPropertySetRegistry methods. - // virtual Reference< XPersistentPropertySet > SAL_CALL PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) @@ -473,11 +449,9 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) } - // XElementAccess methods. - // virtual css::uno::Type SAL_CALL PropertySetRegistry::getElementType() throw( RuntimeException, std::exception ) @@ -501,11 +475,9 @@ sal_Bool SAL_CALL PropertySetRegistry::hasElements() } - // XNameAccess methods. - // virtual Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName ) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) @@ -1128,15 +1100,9 @@ struct PersistentPropertySet_Impl }; - - - // PersistentPropertySet Implementation. - - - PersistentPropertySet::PersistentPropertySet( const Reference< XComponentContext >& xContext, PropertySetRegistry& rCreator, @@ -1159,17 +1125,14 @@ PersistentPropertySet::~PersistentPropertySet() // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet, OUString( "com.sun.star.comp.ucb.PersistentPropertySet" ), PERS_PROPSET_SERVICE_NAME ); - // XComponent methods. - // virtual void SAL_CALL PersistentPropertySet::dispose() throw( RuntimeException, std::exception ) @@ -1224,11 +1187,9 @@ void SAL_CALL PersistentPropertySet::removeEventListener( } - // XPropertySet methods. - // virtual Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo() throw( RuntimeException, std::exception ) @@ -1449,11 +1410,9 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener( } - // XPersistentPropertySet methods. - // virtual Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry() throw( RuntimeException, std::exception ) @@ -1470,11 +1429,9 @@ OUString SAL_CALL PersistentPropertySet::getKey() } - // XNamed methods. - // virtual OUString SAL_CALL PersistentPropertySet::getName() throw( RuntimeException, std::exception ) @@ -1493,11 +1450,9 @@ void SAL_CALL PersistentPropertySet::setName( const OUString& aName ) } - // XPropertyContainer methods. - // virtual void SAL_CALL PersistentPropertySet::addProperty( const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue ) @@ -1810,11 +1765,9 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) } - // XPropertySetInfoChangeNotifier methods. - // virtual void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener( const Reference< XPropertySetInfoChangeListener >& Listener ) @@ -1838,11 +1791,9 @@ void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener( } - // XPropertyAccess methods. - // virtual Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() throw( RuntimeException, std::exception ) @@ -2103,11 +2054,9 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( } - // Non-interface methods - void PersistentPropertySet::notifyPropertyChangeEvent( const PropertyChangeEvent& rEvent ) const { @@ -2189,13 +2138,9 @@ PropertySetRegistry& PersistentPropertySet::getPropertySetRegistry() } - - // PropertySetInfo_Impl Implementation. - - PropertySetInfo_Impl::PropertySetInfo_Impl( const Reference< XComponentContext >& xContext, PersistentPropertySet* pOwner ) @@ -2217,7 +2162,6 @@ PropertySetInfo_Impl::~PropertySetInfo_Impl() // XPropertySetInfo methods. - // virtual Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() throw( RuntimeException, std::exception ) diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 40e4470d7907..863134a3ac1e 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -44,7 +44,6 @@ #define PERS_PROPSET_SERVICE_NAME "com.sun.star.ucb.PersistentPropertySet" - struct UcbStore_Impl; class UcbStore : public cppu::WeakImplHelper < @@ -90,7 +89,6 @@ public: }; - struct PropertySetRegistry_Impl; class PersistentPropertySet; @@ -169,7 +167,6 @@ public: }; - struct PersistentPropertySet_Impl; class PersistentPropertySet : public cppu::WeakImplHelper < diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 7485e1e6e5f9..6f7ea3f01095 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -55,7 +55,6 @@ private: }; - template< typename Val > struct Entry { diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 76688d3f103e..f2c53e8691c7 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -31,11 +31,9 @@ using namespace com::sun::star; using namespace ucb_impl; - // Regexp - inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix, bool bTheEmptyDomain, OUString const & rTheInfix, bool bTheTranslation, diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index ebc6a6757d77..b59cb8963a8a 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -159,7 +159,6 @@ public: }; - class SortedDynamicResultSetFactory: public cppu::WeakImplHelper < css::lang::XServiceInfo, css::ucb::XSortedDynamicResultSetFactory > diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 83300d8a1a93..b11ca1887141 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -25,7 +25,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { @@ -46,7 +45,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 945fee5c9834..18b055eceb44 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -43,8 +43,6 @@ using namespace com::sun::star::util; using namespace cppu; - - // The mutex to synchronize access to containers. static osl::Mutex& getContainerMutex() { @@ -63,7 +61,6 @@ static osl::Mutex& getContainerMutex() } - struct SortInfo { bool mbUseOwnCompare; @@ -76,7 +73,6 @@ struct SortInfo }; - struct SortListData { bool mbModified; @@ -87,11 +83,9 @@ struct SortListData }; - // class SRSPropertySetInfo. - class SRSPropertySetInfo : public cppu::WeakImplHelper < XPropertySetInfo > { @@ -285,7 +279,6 @@ SortedResultSet::queryContent() } - // XResultSet methods. sal_Bool SAL_CALL SortedResultSet::next() @@ -805,7 +798,6 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) } - // XCloseable methods. @@ -828,7 +820,6 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() } - // XPropertySet methods. @@ -1338,8 +1329,6 @@ void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt ) } - - // public methods @@ -1798,7 +1787,6 @@ void SortedResultSet::ResortNew( EventList* pList ) } - // SortListData @@ -1810,7 +1798,6 @@ SortListData::SortListData( sal_IntPtr nPos, bool bModified ) }; - void SortedEntryList::Clear() { for ( std::deque< ListAction* >::size_type i = 0; @@ -1886,8 +1873,6 @@ sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const } - - void SimpleList::Remove( sal_uInt32 nPos ) { if ( nPos < (sal_uInt32) maData.size() ) @@ -1941,11 +1926,9 @@ void SimpleList::Replace( void* pData, sal_uInt32 nPos ) } - // class SRSPropertySetInfo. - SRSPropertySetInfo::SRSPropertySetInfo() { maProps[0].Name = "RowCount"; diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index 5f45da992782..ff248976548b 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -67,7 +67,6 @@ public: }; - class EventList { std::deque < css::ucb::ListAction* > maData; @@ -85,7 +84,6 @@ public: }; - class SimpleList { std::deque < void* > maData; @@ -108,11 +106,9 @@ public: }; - #define RESULTSET_SERVICE_NAME "com.sun.star.ucb.SortedResultSet" - class SortedResultSet: public cppu::WeakImplHelper < css::lang::XServiceInfo, css::lang::XComponent, diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index 103ccad2dbb6..151b85c22323 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -40,9 +40,6 @@ namespace cmis } - - - void URL::setObjectPath( const OUString& sPath ) { m_sPath = sPath; diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index fcd0a433d92e..aad3588119e5 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -34,7 +34,6 @@ namespace ucb { namespace ucp { namespace ext { - //= ExtensionContentType enum ExtensionContentType diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 1c23942e0894..8ecda7995f23 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -118,7 +118,6 @@ namespace ucb { namespace ucp { namespace ext } - //= DataSupplier diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 6bf33eee1e70..e803e20d6878 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -27,7 +27,6 @@ namespace ucb { namespace ucp { namespace ext { - //= ContentProvider typedef ::ucbhelper::ContentProviderImplHelper ContentProvider_Base; diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 8b411846d1a1..b8296f6c844b 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -96,7 +96,6 @@ BaseContent::BaseContent( shell* pMyShell, } - // Constructor for full featured Contents BaseContent::BaseContent( shell* pMyShell, @@ -133,7 +132,6 @@ BaseContent::~BaseContent( ) } - // XInterface @@ -172,9 +170,6 @@ BaseContent::queryInterface( const Type& rType ) } - - - // XComponent @@ -287,7 +282,6 @@ XTYPEPROVIDER_IMPL_10( BaseContent, beans::XPropertySetInfoChangeNotifier ) - // XCommandProcessor @@ -426,7 +420,6 @@ BaseContent::execute( const Command& aCommand, } - void SAL_CALL BaseContent::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, @@ -474,7 +467,6 @@ BaseContent::removePropertiesChangeListener( const Sequence< OUString >& Propert } - // XContent @@ -535,7 +527,6 @@ BaseContent::getContentType() } - void SAL_CALL BaseContent::addContentEventListener( const Reference< XContentEventListener >& Listener ) @@ -564,12 +555,9 @@ BaseContent::removeContentEventListener( } - - // XPropertyContainer - void SAL_CALL BaseContent::addProperty( const OUString& Name, @@ -676,11 +664,9 @@ BaseContent::createNewContent( } - // XPropertySetInfoChangeNotifier - void SAL_CALL BaseContent::addPropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) @@ -706,7 +692,6 @@ BaseContent::removePropertySetInfoChangeListener( } - // XChild @@ -747,11 +732,9 @@ BaseContent::setParent( } - // Private Methods - Reference< XCommandInfo > SAL_CALL BaseContent::getCommandInfo() throw( RuntimeException ) @@ -962,7 +945,6 @@ BaseContent::setPropertyValues( } - Reference< XDynamicResultSet > SAL_CALL BaseContent::open( sal_Int32 nMyCommandIdentifier, @@ -1039,7 +1021,6 @@ BaseContent::open( } - void SAL_CALL BaseContent::deleteContent( sal_Int32 nMyCommandIdentifier ) { @@ -1054,7 +1035,6 @@ BaseContent::deleteContent( sal_Int32 nMyCommandIdentifier ) } - void SAL_CALL BaseContent::transfer( sal_Int32 nMyCommandIdentifier, const TransferInfo& aTransferInfo ) @@ -1125,8 +1105,6 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, } - - void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, const InsertCommandArgument& aInsertArgument ) { @@ -1244,7 +1222,6 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, } - void SAL_CALL BaseContent::endTask( sal_Int32 CommandId ) { // This is the only function allowed to throw an exception @@ -1252,7 +1229,6 @@ void SAL_CALL BaseContent::endTask( sal_Int32 CommandId ) } - ContentEventNotifier* BaseContent::cDEL() { @@ -1323,7 +1299,6 @@ BaseContent::cPSL() } - PropertyChangeNotifier* BaseContent::cPCL() { diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index 95be18aa33dd..2390ec6f7cba 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -42,7 +42,6 @@ XCommandInfo_impl::~XCommandInfo_impl() } - void SAL_CALL XCommandInfo_impl::acquire( void ) diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 72267c3b9d97..1f34f8fdea68 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -148,7 +148,6 @@ namespace { } - namespace fileaccess { diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 89f7f56b7a9c..f99cd412d63c 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -76,14 +76,12 @@ XInputStream_impl::~XInputStream_impl() // XTypeProvider - XTYPEPROVIDER_IMPL_3( XInputStream_impl, lang::XTypeProvider, io::XSeekable, io::XInputStream ) - uno::Any SAL_CALL XInputStream_impl::queryInterface( const uno::Type& rType ) @@ -115,7 +113,6 @@ XInputStream_impl::release( } - sal_Int32 SAL_CALL XInputStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index e6466b9a59d3..27e69711d12a 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> - using namespace cppu; using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 511d8f2daf50..6d2196742d74 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -74,7 +74,6 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< }; - class XInteractionAbortImpl : public cppu::WeakImplHelper< css::task::XInteractionAbort > { @@ -103,7 +102,6 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< }; - class XInteractionRequestImpl { public: diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index aba54e3c5fcd..a4d10f1f2615 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -26,7 +26,6 @@ #include "prov.hxx" - using namespace fileaccess; using namespace com::sun::star; using namespace com::sun::star::ucb; @@ -58,7 +57,6 @@ ContentEventNotifier::ContentEventNotifier( shell* pMyShell, } - void ContentEventNotifier::notifyChildInserted( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( aChildName ); @@ -97,7 +95,6 @@ void ContentEventNotifier::notifyDeleted() } - void ContentEventNotifier::notifyRemoved( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( aChildName ); diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 9bf21571f587..f8b2985a0485 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -88,7 +88,6 @@ XPropertySetInfo_impl::getPropertyByName( } - Sequence< beans::Property > SAL_CALL XPropertySetInfo_impl::getProperties( void ) diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 3f973de9143b..8dfd07273e8a 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -92,12 +92,6 @@ XResultSet_impl::~XResultSet_impl() } - - - - - - void SAL_CALL XResultSet_impl::disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) @@ -133,7 +127,6 @@ XResultSet_impl::removeEventListener( } - void SAL_CALL XResultSet_impl::dispose() throw( uno::RuntimeException, std::exception ) @@ -158,7 +151,6 @@ XResultSet_impl::dispose() } - void XResultSet_impl::rowCountChanged() { sal_Int32 aOldValue,aNewValue; @@ -292,9 +284,6 @@ XResultSet_impl::OneMore( } - - - sal_Bool SAL_CALL XResultSet_impl::next( void ) @@ -412,7 +401,6 @@ XResultSet_impl::getRow( } - sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) throw( sdbc::SQLException, uno::RuntimeException, std::exception) { @@ -435,8 +423,6 @@ sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) } - - sal_Bool SAL_CALL XResultSet_impl::relative( sal_Int32 row ) @@ -454,7 +440,6 @@ XResultSet_impl::relative( } - sal_Bool SAL_CALL XResultSet_impl::previous( void ) @@ -536,7 +521,6 @@ XResultSet_impl::close( } - OUString SAL_CALL XResultSet_impl::queryContentIdentifierString( void ) @@ -722,7 +706,6 @@ XResultSet_impl::getMetaData( } - // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL XResultSet_impl::getPropertySetInfo() @@ -746,7 +729,6 @@ XResultSet_impl::getPropertySetInfo() } - void SAL_CALL XResultSet_impl::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) throw( beans::UnknownPropertyException, diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index ca8598035fc8..0d3e18ae8654 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -85,12 +85,6 @@ XStream_impl::~XStream_impl() } - - - - - - uno::Reference< io::XInputStream > SAL_CALL XStream_impl::getInputStream( ) throw( uno::RuntimeException, std::exception) @@ -126,8 +120,6 @@ void SAL_CALL XStream_impl::truncate() } - - // XStream_impl private non interface methods diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index f031fc836022..2b7fe07b4bd5 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -153,7 +153,6 @@ class XStream_impl : public cppu::WeakImplHelper< css::uno::RuntimeException, std::exception) override; - void SAL_CALL flush() throw( css::io::NotConnectedException, diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 35bd200b0b7b..22cc98fdff98 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -33,20 +33,17 @@ using namespace com::sun::star::uno; using namespace com::sun::star::ucb; - TaskManager::TaskManager() : m_nCommandId( 0 ) { } - TaskManager::~TaskManager() { } - void SAL_CALL TaskManager::startTask( sal_Int32 CommandId, @@ -63,7 +60,6 @@ TaskManager::startTask( } - void SAL_CALL TaskManager::endTask( sal_Int32 CommandId, const OUString& aUncPath, @@ -94,7 +90,6 @@ TaskManager::endTask( sal_Int32 CommandId, } - void SAL_CALL TaskManager::abort( sal_Int32 CommandId ) { @@ -133,7 +128,6 @@ void SAL_CALL TaskManager::retrieveError( sal_Int32 CommandId, } - void SAL_CALL TaskManager::installError( sal_Int32 CommandId, sal_Int32 ErrorCode, sal_Int32 MinorCode ) @@ -145,7 +139,6 @@ void SAL_CALL TaskManager::installError( sal_Int32 CommandId, } - sal_Int32 SAL_CALL TaskManager::getCommandId() { @@ -154,7 +147,6 @@ TaskManager::getCommandId() } - void SAL_CALL TaskManager::handleTask( sal_Int32 CommandId, const uno::Reference< task::XInteractionRequest >& request ) diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 96db2c759a31..5eb00115f356 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -67,7 +67,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); @@ -162,12 +161,9 @@ FileProvider::CreateInstance( } - - // XContent - Reference< XContent > SAL_CALL FileProvider::queryContent( const Reference< XContentIdentifier >& xIdentifier ) @@ -186,7 +182,6 @@ FileProvider::queryContent( } - sal_Int32 SAL_CALL FileProvider::compareContentIds( const Reference< XContentIdentifier >& Id1, @@ -245,7 +240,6 @@ FileProvider::compareContentIds( } - Reference< XContentIdentifier > SAL_CALL FileProvider::createContentIdentifier( const OUString& ContentId ) @@ -257,7 +251,6 @@ FileProvider::createContentIdentifier( } - //XPropertySetInfoImpl class XPropertySetInfoImpl2 @@ -375,7 +368,6 @@ XPropertySetInfoImpl2::getPropertyByName( } - Sequence< Property > SAL_CALL XPropertySetInfoImpl2::getProperties( void ) @@ -397,9 +389,6 @@ XPropertySetInfoImpl2::hasPropertyByName( } - - - void SAL_CALL FileProvider::initProperties() { osl::MutexGuard aGuard( m_aMutex ); @@ -457,7 +446,6 @@ FileProvider::setPropertyValue( const OUString& aPropertyName, } - Any SAL_CALL FileProvider::getPropertyValue( const OUString& aPropertyName ) @@ -536,7 +524,6 @@ FileProvider::removeVetoableChangeListener( } - // XFileIdentifierConverter sal_Int32 SAL_CALL diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index d65aedd19ca7..0f0756f8236c 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -40,7 +40,6 @@ // FileProvider - namespace fileaccess { // Forward declaration diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index cb27c763df17..46152804180b 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -434,7 +434,6 @@ shell::registerNotifier( const OUString& aUnqPath, Notifier* pNotifier ) } - void SAL_CALL shell::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) { @@ -451,7 +450,6 @@ shell::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) } - /*********************************************************************************/ /* */ /* de/associate-Implementation */ @@ -505,8 +503,6 @@ shell::associate( const OUString& aUnqPath, } - - void SAL_CALL shell::deassociate( const OUString& aUnqPath, const OUString& PropertyName ) @@ -554,8 +550,6 @@ shell::deassociate( const OUString& aUnqPath, } - - /*********************************************************************************/ /* */ /* page-Implementation */ @@ -566,7 +560,6 @@ shell::deassociate( const OUString& aUnqPath, // URL aUnqPath into the XOutputStream - void SAL_CALL shell::page( sal_Int32 CommandId, const OUString& aUnqPath, const uno::Reference< io::XOutputStream >& xOutputStream ) @@ -655,7 +648,6 @@ void SAL_CALL shell::page( sal_Int32 CommandId, // Given a file URL aUnqPath, this methods returns a XInputStream which reads from the open file. - uno::Reference< io::XInputStream > SAL_CALL shell::open( sal_Int32 CommandId, const OUString& aUnqPath, @@ -679,8 +671,6 @@ shell::open( sal_Int32 CommandId, } - - /*********************************************************************************/ /* */ /* open for read/write access-Implementation */ @@ -691,7 +681,6 @@ shell::open( sal_Int32 CommandId, // to read and write from/to the file. - uno::Reference< io::XStream > SAL_CALL shell::open_rw( sal_Int32 CommandId, const OUString& aUnqPath, @@ -714,7 +703,6 @@ shell::open_rw( sal_Int32 CommandId, } - /*********************************************************************************/ /* */ /* ls-Implementation */ @@ -725,7 +713,6 @@ shell::open_rw( sal_Int32 CommandId, // to file URL aUnqPath - uno::Reference< XDynamicResultSet > SAL_CALL shell::ls( sal_Int32 CommandId, const OUString& aUnqPath, @@ -751,8 +738,6 @@ shell::ls( sal_Int32 CommandId, } - - /*********************************************************************************/ /* */ /* info_c implementation */ @@ -768,8 +753,6 @@ shell::info_c() } - - /*********************************************************************************/ /* */ /* info_p-Implementation */ @@ -786,8 +769,6 @@ shell::info_p( const OUString& aUnqPath ) } - - /*********************************************************************************/ /* */ /* setv-Implementation */ @@ -797,7 +778,6 @@ shell::info_p( const OUString& aUnqPath ) // Sets the values of the properties belonging to fileURL aUnqPath - uno::Sequence< uno::Any > SAL_CALL shell::setv( const OUString& aUnqPath, const uno::Sequence< beans::PropertyValue >& values ) @@ -1032,7 +1012,6 @@ shell::setv( const OUString& aUnqPath, // Returns an XRow object containing the values in the requested order. - uno::Reference< sdbc::XRow > SAL_CALL shell::getv( sal_Int32 CommandId, const OUString& aUnqPath, @@ -1274,7 +1253,6 @@ shell::move( sal_Int32 CommandId, } - /********************************************************************************/ /* */ /* copy-implementation */ @@ -1470,7 +1448,6 @@ shell::copy( } - /********************************************************************************/ /* */ /* remove-implementation */ @@ -1481,7 +1458,6 @@ shell::copy( // Return: success of operation - bool SAL_CALL shell::remove( sal_Int32 CommandId, const OUString& aUnqPath, @@ -1888,7 +1864,6 @@ shell::write( sal_Int32 CommandId, } - /*********************************************************************************/ /* */ /* insertDefaultProperties-Implementation */ @@ -1924,8 +1899,6 @@ void SAL_CALL shell::insertDefaultProperties( const OUString& aUnqPath ) } - - /******************************************************************************/ /* */ /* mapping of file urls */ @@ -1955,7 +1928,6 @@ bool SAL_CALL shell::getUnqFromUrl( const OUString& Url, OUString& Unq ) } - bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url ) { bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url ); @@ -1966,7 +1938,6 @@ bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url ) } - // Helper function for public copy osl::FileBase::RC SAL_CALL @@ -2036,7 +2007,6 @@ shell::copy_recursive( const OUString& srcUnqPath, } - // Helper function for mkfil,mkdir and write // Creates whole path // returns success of the operation @@ -2123,15 +2093,11 @@ bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, } - - - // Given a sequence of properties seq, this method determines the mask // used to instantiate a osl::FileStatus, so that a call to // osl::DirectoryItem::getFileStatus fills the required fields. - void SAL_CALL shell::getMaskFromProperties( sal_Int32& n_Mask, @@ -2165,7 +2131,6 @@ shell::getMaskFromProperties( } - /*********************************************************************************/ /* */ /* load-Implementation */ @@ -2224,8 +2189,6 @@ shell::load( const ContentMap::iterator& it, bool create ) } - - /*********************************************************************************/ /* */ /* commit-Implementation */ @@ -2534,10 +2497,6 @@ shell::getv( } - - - - // EventListener @@ -2567,7 +2526,6 @@ shell::getContentEventListeners( const OUString& aName ) } - std::list< ContentEventNotifier* >* SAL_CALL shell::getContentDeletedEventListeners( const OUString& aName ) { @@ -2637,8 +2595,6 @@ shell::notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, } - - std::list< PropertySetInfoChangeNotifier* >* SAL_CALL shell::getPropertySetListeners( const OUString& aName ) { @@ -2695,7 +2651,6 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* liste } - std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL shell::getContentExchangedEventListeners( const OUString& aOldPrefix, const OUString& aNewPrefix, @@ -2799,7 +2754,6 @@ shell::getContentExchangedEventListeners( const OUString& aOldPrefix, } - void SAL_CALL shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* >* listeners_vec ) { @@ -2820,7 +2774,6 @@ shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* } - std::list< PropertyChangeNotifier* >* SAL_CALL shell::getPropertyChangeNotifier( const OUString& aName ) { @@ -2861,8 +2814,6 @@ void SAL_CALL shell::notifyPropertyChanges( std::list< PropertyChangeNotifier* > } - - /********************************************************************************/ /* remove persistent propertyset */ /********************************************************************************/ @@ -2921,8 +2872,6 @@ shell::erasePersistentSet( const OUString& aUnqPath, } - - /********************************************************************************/ /* copy persistent propertyset */ /* from srcUnqPath to dstUnqPath */ diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index c629d65c59fc..4bd10c0856ee 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -159,7 +159,6 @@ namespace fileaccess { virtual ~shell(); - /** * This two methods register and deregister a change listener for the content belonging * to URL aUnqPath @@ -170,7 +169,6 @@ namespace fileaccess { void SAL_CALL deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ); - /** * Used to associate and deassociate a new property with * the content belonging to URL UnqPath. @@ -193,13 +191,10 @@ namespace fileaccess { css::uno::RuntimeException); - - // Every method having a command id is not allowed to throw anything, // but instead must install every error code in the task handler - /** * Given an xOutputStream, this method writes the content of the file belonging to * URL aUnqPath into the XOutputStream @@ -354,7 +349,6 @@ namespace fileaccess { const css::uno::Reference< css::io::XInputStream >& aInputStream ); - void SAL_CALL insertDefaultProperties( const OUString& aUnqPath ); css::uno::Sequence< css::ucb::ContentInfo > diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 03685c743f63..1eb43c28b1e9 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -173,7 +173,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes() } - // XServiceInfo methods. OUString SAL_CALL FTPContent::getImplementationName() @@ -206,9 +205,6 @@ css::uno::Sequence< OUString > FTPContent::getSupportedServiceNames_Static() } - - - // XContent methods. // virtual @@ -681,8 +677,6 @@ FTPContent::createNewContent( const ContentInfo& Info ) } - - Reference<XInterface > SAL_CALL FTPContent::getParent( ) throw (RuntimeException, std::exception) @@ -702,7 +696,6 @@ FTPContent::setParent(const Reference<XInterface >& /*Parent*/ ) } - OUString FTPContent::getParentURL() { return m_aFTPURL.parent(); @@ -727,7 +720,6 @@ private: }; - sal_Int32 InsertData::read(sal_Int8 *dest,sal_Int32 nBytesRequested) { sal_Int32 m = 0; @@ -818,7 +810,6 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand, } - Reference< XRow > FTPContent::getPropertyValues( const Sequence< Property >& seqProp, const Reference<XCommandEnvironment>& /*environment*/ @@ -870,7 +861,6 @@ Reference< XRow > FTPContent::getPropertyValues( } - Sequence<Any> FTPContent::setPropertyValues( const Sequence<PropertyValue>& seqPropVal) { diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 42dd98e863d2..2f35f170a302 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -110,11 +110,9 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( // osl::MutexGuard aGuard( m_aMutex ); - // Supported commands - #define COMMAND_COUNT 8 static const ucb::CommandInfo aCommandInfoTable[] = diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 9b9827a2f6a3..f2e5ecb84c73 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -122,8 +122,4 @@ FTPContentIdentifier::getContentProviderScheme( } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index c6bc270ddb06..caa2a34fec53 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -109,7 +109,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes() } - // XServiceInfo methods. OUString SAL_CALL FTPContentProvider::getImplementationName() @@ -290,7 +289,6 @@ bool FTPContentProvider::setHost( const OUString& host, } - Reference<XContentProvider> FTPContentProvider::getHttpProvider() throw(RuntimeException) { diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index 08e10a14fab0..032f96927f2b 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -37,7 +37,6 @@ inline bool ascii_isWhitespace( sal_Unicode ch ) } - /*======================================================================== * * FTPDirectoryParser implementation. diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index 13b344464be4..69567b30e22d 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -71,7 +71,6 @@ namespace ftp { }; - /*======================================================================== * * the directory information structure diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index 2e764f6115d4..f8d4862e1d34 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -30,13 +30,9 @@ using namespace com::sun::star::uno; using namespace ftp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, const rtl::Reference< FTPContent >& rxContent, @@ -56,11 +52,9 @@ DynamicResultSet::~DynamicResultSet() } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1.set( m_pFactory->createResultSet() ); @@ -75,6 +69,4 @@ void DynamicResultSet::initDynamic() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 4cb1c9beb3d0..2819fc6b0eba 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -47,8 +47,6 @@ void SAL_CALL XInteractionApproveImpl::select() } - - // XInteractionDisapproveImpl XInteractionDisapproveImpl::XInteractionDisapproveImpl() diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 8088755ba06c..a00feb520dfd 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -52,8 +52,6 @@ namespace ftp { }; - - class XInteractionDisapproveImpl : public cppu::WeakImplHelper < css::task::XInteractionDisapprove > { @@ -70,7 +68,6 @@ namespace ftp { }; - class XInteractionRequestImpl { public: diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx index 888219c1929e..25bc26d55428 100644 --- a/ucb/source/ucp/ftp/ftploaderthread.cxx +++ b/ucb/source/ucp/ftp/ftploaderthread.cxx @@ -71,13 +71,11 @@ FTPLoaderThread::FTPLoaderThread() } - FTPLoaderThread::~FTPLoaderThread() { osl_destroyThreadKey(m_threadKey); } - CURL* FTPLoaderThread::handle() { CURL* ret = osl_getThreadKeyData(m_threadKey); if(!ret) { diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index bd09094e18e7..207912cddaf1 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -76,7 +76,6 @@ ResultSetBase::release( } - uno::Any SAL_CALL ResultSetBase::queryInterface( const uno::Type& rType ) @@ -94,7 +93,6 @@ ResultSetBase::queryInterface( } - // XComponent @@ -125,7 +123,6 @@ ResultSetBase::removeEventListener( } - void SAL_CALL ResultSetBase::dispose() throw( uno::RuntimeException, std::exception ) @@ -150,7 +147,6 @@ ResultSetBase::dispose() } - // XResultSet sal_Bool SAL_CALL @@ -284,8 +280,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row ) } - - sal_Bool SAL_CALL ResultSetBase::relative( sal_Int32 row ) @@ -306,7 +300,6 @@ ResultSetBase::relative( } - sal_Bool SAL_CALL ResultSetBase::previous( void ) @@ -428,7 +421,6 @@ ResultSetBase::queryContent( } - class XPropertySetInfoImpl : public cppu::OWeakObject, public beans::XPropertySetInfo @@ -493,7 +485,6 @@ private: }; - // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSetBase::getPropertySetInfo() @@ -516,7 +507,6 @@ ResultSetBase::getPropertySetInfo() } - void SAL_CALL ResultSetBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ ) throw( beans::UnknownPropertyException, @@ -630,7 +620,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener( } - // XResultSetMetaDataSupplier uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSetBase::getMetaData( @@ -644,6 +633,4 @@ ResultSetBase::getMetaData( } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx index a87c71ecf66b..30cb9a46b1e1 100644 --- a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx @@ -28,7 +28,6 @@ #include "ftpresultsetbase.hxx" - namespace ftp { class ResultSetBase; @@ -45,7 +44,6 @@ namespace ftp { } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index f865d9aeeb2c..b415350fe7d2 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -355,7 +355,6 @@ OUString FTPURL::child() const } - /** Listing of a directory. */ @@ -670,7 +669,6 @@ void FTPURL::insert(bool replaceExisting,void* stream) const } - void FTPURL::mkdir(bool ReplaceExisting) const throw (curl_exception, malformed_exception, std::exception) { @@ -764,7 +762,6 @@ OUString FTPURL::ren(const OUString& NewTitle) } - void FTPURL::del() const throw(curl_exception, malformed_exception, std::exception) { diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx index f29b7008f9bc..dfa842af06e1 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rxContent, @@ -51,11 +47,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 4260e7fffa5f..5644778fb0fe 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -74,13 +74,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - - // HierarchyContent Implementation. - - // static ( "virtual" ctor ) HierarchyContent* HierarchyContent::create( const uno::Reference< uno::XComponentContext >& rxContext, @@ -151,11 +147,9 @@ HierarchyContent::~HierarchyContent() } - // XInterface methods. - // virtual void SAL_CALL HierarchyContent::acquire() throw( ) @@ -195,11 +189,9 @@ uno::Any SAL_CALL HierarchyContent::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( HierarchyContent ); @@ -279,11 +271,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL HierarchyContent::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -310,11 +300,9 @@ HierarchyContent::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL HierarchyContent::getContentType() throw( uno::RuntimeException, std::exception ) @@ -339,11 +327,9 @@ HierarchyContent::getIdentifier() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL HierarchyContent::execute( const ucb::Command& aCommand, @@ -572,11 +558,9 @@ void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL HierarchyContent::queryCreatableContentsInfo() @@ -1847,13 +1831,9 @@ void HierarchyContent::transfer( } - - // HierarchyContentProperties Implementation. - - uno::Sequence< ucb::ContentInfo > HierarchyContentProperties::getCreatableContentsInfo() const { diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index 60740ae039ca..f7482eacc4cf 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -44,7 +44,6 @@ namespace hierarchy_ucp { - class HierarchyContentProperties { public: @@ -92,7 +91,6 @@ private: }; - class HierarchyContentProvider; class HierarchyContent : public ::ucbhelper::ContentImplHelper, diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 1d053d2ac3f9..b30465ed1076 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -62,11 +62,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - // HierarchyContent implementation. - #define MAKEPROPSEQUENCE( a ) \ uno::Sequence< beans::Property >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) @@ -74,12 +72,10 @@ using namespace hierarchy_ucp; uno::Sequence< ucb::CommandInfo >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) - // IMPORTANT: If any property data ( name / type / ... ) are changed, then // HierarchyContent::getPropertyValues(...) must be adapted too! - // virtual uno::Sequence< beans::Property > HierarchyContent::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) @@ -93,7 +89,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Link: Supported properties - if ( isReadOnly() ) { static const beans::Property aLinkPropertyInfoTable[] = @@ -216,7 +211,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Folder: Supported properties - if ( isReadOnly() ) { static const beans::Property aFolderPropertyInfoTable[] = @@ -326,7 +320,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Root Folder: Supported properties - // Currently no difference between read-only/read-write // -> all props ar read-only @@ -395,7 +388,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Link: Supported commands - if ( isReadOnly() ) { static const ucb::CommandInfo aLinkCommandInfoTable[] = @@ -427,7 +419,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands - // New commands }; @@ -487,7 +478,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Folder: Supported commands - if ( isReadOnly() ) { static const ucb::CommandInfo aFolderCommandInfoTable[] = @@ -598,7 +588,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Root Folder: Supported commands - if ( isReadOnly() ) { static const ucb::CommandInfo aRootFolderCommandInfoTable[] = diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 199ca0332e58..c027ec46f0dc 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -94,13 +94,9 @@ void makeXMLName( const OUString & rIn, OUStringBuffer & rBuffer ) } - - // HierarchyEntry Implementation. - - #define READ_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadAccess" #define READWRITE_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadWriteAccess" @@ -1061,13 +1057,9 @@ HierarchyEntry::getRootReadAccess() } - - // HierarchyEntry::iterator Implementation. - - HierarchyEntry::iterator::iterator() : m_pImpl( new iterator_Impl ) { diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index d3800b139ed1..badca56297c6 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -39,7 +39,6 @@ namespace hierarchy_ucp { - class HierarchyEntryData { public: @@ -72,7 +71,6 @@ private: }; - class HierarchyContentProvider; class HierarchyUri; diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 398a044047a9..d99978a381d0 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -43,7 +43,6 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - // describe path of cfg entry #define CFGPROPERTY_NODEPATH "nodepath" // true->async. update; false->sync. update @@ -56,16 +55,13 @@ using namespace hierarchy_ucp; "/org.openoffice.ucb.Hierarchy/Root" - namespace hcp_impl { - // HierarchyDataReadAccess Implementation. - class HierarchyDataAccess : public cppu::OWeakObject, public lang::XServiceInfo, public lang::XTypeProvider, @@ -217,13 +213,9 @@ public: using namespace hcp_impl; - - // HierarchyDataSource Implementation. - - HierarchyDataSource::HierarchyDataSource( const uno::Reference< uno::XComponentContext > & rxContext ) : m_xContext( rxContext ), @@ -239,7 +231,6 @@ HierarchyDataSource::~HierarchyDataSource() } - // XInterface methods. void SAL_CALL HierarchyDataSource::acquire() throw() @@ -268,7 +259,6 @@ css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const css::uno::Type // XTypeProvider methods. - XTYPEPROVIDER_IMPL_4( HierarchyDataSource, lang::XTypeProvider, lang::XServiceInfo, @@ -276,11 +266,9 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource, lang::XMultiServiceFactory ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource, OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) { @@ -293,11 +281,9 @@ XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource, ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource ); - // XComponent methods. - // virtual void SAL_CALL HierarchyDataSource::dispose() throw( uno::RuntimeException, std::exception ) @@ -340,11 +326,9 @@ void SAL_CALL HierarchyDataSource::removeEventListener( } - // XMultiServiceFactory methods. - // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) @@ -386,11 +370,9 @@ HierarchyDataSource::getAvailableServiceNames() } - // Non-interface methods - uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, @@ -593,13 +575,9 @@ bool HierarchyDataSource::createConfigPath( } - - // HierarchyDataAccess Implementation. - - #define ENSURE_ORIG_INTERFACE( interface_name, member_name ) \ m_xCfg##member_name; \ if ( !m_xCfg##member_name.is() ) \ @@ -626,7 +604,6 @@ HierarchyDataAccess::~HierarchyDataAccess() } - // XInterface methods. void SAL_CALL HierarchyDataAccess::acquire() throw() @@ -668,11 +645,9 @@ uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess ); @@ -745,11 +720,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() } - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_0( HierarchyDataAccess, OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) ) @@ -761,11 +734,9 @@ XSERVICEINFO_NOFACTORY_IMPL_0( } - // XComponent methods. - // virtual void SAL_CALL HierarchyDataAccess::dispose() throw ( uno::RuntimeException, std::exception ) @@ -807,11 +778,9 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( } - // XHierarchicalNameAccess methods. - // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( const OUString & aName ) @@ -842,11 +811,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( } - // XNameAccess methods. - // virtual uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) throw ( container::NoSuchElementException, @@ -888,11 +855,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) } - // XElementAccess methods. - // virtual uno::Type SAL_CALL HierarchyDataAccess::getElementType() throw ( uno::RuntimeException, std::exception ) @@ -919,11 +884,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements() } - // XChangesNotifier methods. - // virtual void SAL_CALL HierarchyDataAccess::addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) @@ -952,11 +915,9 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener( } - // XSingleServiceFactory methods. - // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() throw ( uno::Exception, uno::RuntimeException, std::exception ) @@ -985,11 +946,9 @@ HierarchyDataAccess::createInstanceWithArguments( } - // XNameContainer methods. - // virtual void SAL_CALL HierarchyDataAccess::insertByName( const OUString & aName, @@ -1024,11 +983,9 @@ HierarchyDataAccess::removeByName( const OUString & Name ) } - // XNameReplace methods. - // virtual void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, const uno::Any & aElement ) @@ -1046,11 +1003,9 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, } - // XChangesBatch methods. - // virtual void SAL_CALL HierarchyDataAccess::commitChanges() throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index 8ee2ac3d2a6e..f9d2c2a3e438 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -34,7 +34,6 @@ namespace cppu { class OInterfaceContainerHelper; } namespace hierarchy_ucp { - class HierarchyDataSource : public cppu::OWeakObject, public css::lang::XServiceInfo, public css::lang::XTypeProvider, diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index 5789f72481c1..3796652a9e79 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -37,11 +37,9 @@ namespace hierarchy_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aId; @@ -54,19 +52,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -107,13 +101,9 @@ DataSupplier_Impl::~DataSupplier_Impl() } - - // HierarchyResultSetDataSupplier Implementation. - - HierarchyResultSetDataSupplier::HierarchyResultSetDataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rContent, diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index b63fd36ca35b..66a0346744a0 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -41,13 +41,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - - // HierarchyContentProvider Implementation. - - HierarchyContentProvider::HierarchyContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) : ::ucbhelper::ContentProviderImplHelper( rxContext ) @@ -61,7 +57,6 @@ HierarchyContentProvider::~HierarchyContentProvider() } - // XInterface methods. void SAL_CALL HierarchyContentProvider::acquire() @@ -91,7 +86,6 @@ css::uno::Any SAL_CALL HierarchyContentProvider::queryInterface( const css::uno: // XTypeProvider methods. - XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, lang::XTypeProvider, lang::XServiceInfo, @@ -99,29 +93,23 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, lang::XInitialization ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider, OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), "com.sun.star.ucb.HierarchyContentProvider" ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL HierarchyContentProvider::queryContent( @@ -154,11 +142,9 @@ HierarchyContentProvider::queryContent( } - // XInitialization methods. - // virtual void SAL_CALL HierarchyContentProvider::initialize( const uno::Sequence< uno::Any >& aArguments ) @@ -169,11 +155,9 @@ void SAL_CALL HierarchyContentProvider::initialize( } - // Non-interface methods. - uno::Reference< lang::XMultiServiceFactory > HierarchyContentProvider::getConfigProvider( const OUString & rServiceSpecifier ) diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index aa6a93b11e44..d8c3ac184362 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace hierarchy_ucp { - #define HIERARCHY_URL_SCHEME \ "vnd.sun.star.hier" #define HIERARCHY_URL_SCHEME_LENGTH 17 diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index 16c0405ff28a..76eecc876f1f 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -57,7 +57,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index 196992db664e..d76440f3a25e 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -32,18 +32,13 @@ using namespace hierarchy_ucp; - #define DEFAULT_DATA_SOURCE_SERVICE \ "com.sun.star.ucb.DefaultHierarchyDataSource" - - // HierarchyUri Implementation. - - void HierarchyUri::init() const { // Already inited? diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx index fac3a8e1d622..24dfb05f47c5 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx @@ -25,12 +25,10 @@ namespace hierarchy_ucp { - #define HIERARCHY_URL_SCHEME "vnd.sun.star.hier" #define HIERARCHY_URL_SCHEME_LENGTH 17 - class HierarchyUri { mutable OUString m_aUri; diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx index 2a2b403615e7..7de35d57f9e6 100644 --- a/ucb/source/ucp/inc/urihelper.hxx +++ b/ucb/source/ucp/inc/urihelper.hxx @@ -25,7 +25,6 @@ #include "rtl/uri.hxx" - namespace ucb_impl { namespace urihelper { inline OUString encodeSegment( const OUString & rSegment ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index c0929f272865..0a2b6e8601b2 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -77,13 +77,9 @@ using namespace package_ucp; #define ENCRYPTIONKEY_MODIFIED sal_uInt32( 0x08 ) - - // ContentProperties Implementation. - - ContentProperties::ContentProperties( const OUString& rContentType ) : aContentType( rContentType ), nSize( 0 ), @@ -99,7 +95,6 @@ ContentProperties::ContentProperties( const OUString& rContentType ) } - uno::Sequence< ucb::ContentInfo > ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const { @@ -138,13 +133,9 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const } - - // Content Implementation. - - // static ( "virtual" ctor ) Content* Content::create( const uno::Reference< uno::XComponentContext >& rxContext, @@ -279,11 +270,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -314,11 +303,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -398,11 +385,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -425,11 +410,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) @@ -438,11 +421,9 @@ OUString SAL_CALL Content::getContentType() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -695,11 +676,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -749,11 +728,9 @@ Content::createNewContent( const ucb::ContentInfo& Info ) } - // Non-interface methods. - // virtual OUString Content::getParentURL() { diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index ff0a91741a54..b22c43220f66 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -58,7 +58,6 @@ namespace package_ucp { - struct ContentProperties { OUString aTitle; // Title @@ -84,7 +83,6 @@ struct ContentProperties }; - class ContentProvider; class Content : public ::ucbhelper::ContentImplHelper, diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index 45acf60af2d5..1234293b96cf 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -63,11 +63,9 @@ using namespace com::sun::star; using namespace package_ucp; - // Content implementation. - #define MAKEPROPSEQUENCE( a ) \ uno::Sequence< beans::Property >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) @@ -75,12 +73,10 @@ using namespace package_ucp; uno::Sequence< ucb::CommandInfo >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) - // IMPORTANT: If any property data ( name / type / ... ) are changed, then // Content::getPropertyValues(...) must be adapted too! - // virtual uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) @@ -96,7 +92,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Root Folder: Supported properties - static const beans::Property aRootFolderPropertyInfoTable[] = { @@ -167,7 +162,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Folder: Supported properties - static const beans::Property aFolderPropertyInfoTable[] = { @@ -231,7 +225,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Stream: Supported properties - static const beans::Property aStreamPropertyInfoTable[] = { @@ -324,7 +317,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Root Folder: Supported commands - static const ucb::CommandInfo aRootFolderCommandInfoTable[] = { @@ -387,7 +379,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Folder: Supported commands - static const ucb::CommandInfo aFolderCommandInfoTable[] = { @@ -461,7 +452,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Stream: Supported commands - static const ucb::CommandInfo aStreamCommandInfoTable[] = { diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 38e980339a85..1137516fbb6e 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -43,11 +43,9 @@ namespace package_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aURL; @@ -59,19 +57,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -108,13 +102,9 @@ DataSupplier_Impl::~DataSupplier_Impl() } - - // DataSupplier Implementation. - - DataSupplier::DataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent ) diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 64ebe11b3f69..627e87204d70 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -41,11 +41,9 @@ namespace package_ucp { - // class Package. - class Package : public cppu::OWeakObject, public container::XHierarchicalNameAccess { @@ -144,36 +142,29 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, ucb::XContentProvider ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.ucb.PackageContentProvider" ), "com.sun.star.ucb.PackageContentProvider" ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) @@ -210,11 +201,9 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( } - // Other methods. - uno::Reference< container::XHierarchicalNameAccess > ContentProvider::createPackage( const PackageUri & rURI ) { diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx index cec29da07554..c03bb99f3ed0 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace container { namespace package_ucp { - // UCB Content Type. #define PACKAGE_FOLDER_CONTENT_TYPE \ "application/" PACKAGE_URL_SCHEME "-folder" @@ -42,7 +41,6 @@ namespace package_ucp { "application/" PACKAGE_ZIP_URL_SCHEME "-stream" - class Packages; class ContentProvider : public ::ucbhelper::ContentProviderImplHelper diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx index 33a300e9d26d..d4732094c136 100644 --- a/ucb/source/ucp/package/pkgresultset.cxx +++ b/ucb/source/ucp/package/pkgresultset.cxx @@ -35,13 +35,9 @@ using namespace com::sun::star; using namespace package_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -54,11 +50,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 256ce82fcfbe..cf750b61d8b4 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -45,7 +45,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index a013056413b3..5b84e78f2c96 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -35,14 +35,9 @@ using namespace package_ucp; - - - // PackageUri Implementation. - - static void normalize( OUString& rURL ) { sal_Int32 nPos = 0; diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx index b9e674a5094e..b66bae008b5a 100644 --- a/ucb/source/ucp/package/pkguri.hxx +++ b/ucb/source/ucp/package/pkguri.hxx @@ -25,13 +25,11 @@ namespace package_ucp { - #define PACKAGE_URL_SCHEME "vnd.sun.star.pkg" #define PACKAGE_ZIP_URL_SCHEME "vnd.sun.star.zip" #define PACKAGE_URL_SCHEME_LENGTH 16 - class PackageUri { mutable OUString m_aUri; diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 6438156c5767..5d0cfca8b8d1 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -89,13 +89,9 @@ static ContentType lcl_getContentType( const OUString & rType ) } - - // Content Implementation. - - // static ( "virtual" ctor ) Content* Content::create( const uno::Reference< uno::XComponentContext >& rxContext, @@ -166,11 +162,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -208,11 +202,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -292,11 +284,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -326,11 +316,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) @@ -359,11 +347,9 @@ Content::getIdentifier() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -668,11 +654,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -2925,13 +2909,9 @@ uno::Reference< io::XStream > Content::getStream( } - - // ContentProperties Implementation. - - uno::Sequence< ucb::ContentInfo > ContentProperties::getCreatableContentsInfo() const { diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index 1ae0e658e383..1f582e64caf1 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -85,7 +85,6 @@ private: }; - class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator { diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 7cc288203be6..ed469afbc858 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -73,11 +73,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - // Content implementation. - #define MAKEPROPSEQUENCE( a ) \ uno::Sequence< beans::Property >( a, (sizeof (a) / sizeof (a[0])) ) @@ -85,12 +83,10 @@ using namespace tdoc_ucp; uno::Sequence< ucb::CommandInfo >( a, (sizeof (a) / sizeof (a[0])) ) - // IMPORTANT: If any property data ( name / type / ... ) are changed, then // Content::getPropertyValues(...) must be adapted too! - // virtual uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) @@ -104,7 +100,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Stream: Supported properties - static const beans::Property aStreamPropertyInfoTable[] = { @@ -161,7 +156,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Folder: Supported properties - static const beans::Property aFolderPropertyInfoTable[] = { @@ -225,7 +219,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Document: Supported properties - static const beans::Property aDocPropertyInfoTable[] = { @@ -290,7 +283,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Root: Supported properties - OSL_ENSURE( m_aProps.getType() == ROOT, "Wrong content type!" ); static const beans::Property aRootPropertyInfoTable[] = @@ -365,7 +357,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Stream, that is a child of a document: Supported commands - static const ucb::CommandInfo aStreamCommandInfoTable1[] = { @@ -416,7 +407,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Stream: Supported commands - static const ucb::CommandInfo aStreamCommandInfoTable[] = { @@ -473,7 +463,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Folder: Supported commands - static const ucb::CommandInfo aFolderCommandInfoTable[] = { @@ -540,7 +529,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Document: Supported commands - static const ucb::CommandInfo aDocCommandInfoTable[] = { @@ -597,7 +585,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Root: Supported commands - OSL_ENSURE( m_aProps.getType() == ROOT, "Wrong content type!" ); static const ucb::CommandInfo aRootCommandInfoTable[] = diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 3db64924bf8e..c8213ae8e7f5 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -39,11 +39,9 @@ namespace tdoc_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aURL; @@ -55,19 +53,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 004ef56fc1d7..07fabe9b2bf6 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -51,14 +51,9 @@ using namespace tdoc_ucp; // OfficeDocumentsCloseListener Implementation. - - - - // util::XCloseListener - // virtual void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) @@ -81,11 +76,9 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin } - // lang::XDocumentEventListener (base of util::XCloseListener) - // virtual void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing( const lang::EventObject& /*Source*/ ) @@ -94,13 +87,9 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing( } - - // OfficeDocumentsManager Implementation. - - OfficeDocumentsManager::OfficeDocumentsManager( const uno::Reference< uno::XComponentContext > & rxContext, OfficeDocumentsEventListener * pDocEventListener ) @@ -175,11 +164,9 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) } - // document::XDocumentEventListener - // virtual void SAL_CALL OfficeDocumentsManager::documentEventOccured( const document::DocumentEvent & Event ) diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 047e3eaa3ea8..72717e22817b 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -47,7 +47,6 @@ namespace tdoc_ucp { }; - struct StorageInfo { OUString aTitle; @@ -64,7 +63,6 @@ namespace tdoc_ucp { }; - struct ltref { bool operator()( @@ -77,7 +75,6 @@ namespace tdoc_ucp { typedef std::map< OUString, StorageInfo, ltref > DocumentList; - class OfficeDocumentsManager : public cppu::WeakImplHelper< css::document::XDocumentEventListener > { diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 7cf07b8c7c33..cefb72560990 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -33,13 +33,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // DocumentContentFactory Implementation. - - DocumentContentFactory::DocumentContentFactory( const uno::Reference< lang::XMultiServiceFactory >& xSMgr ) : m_xSMgr( xSMgr ) @@ -53,11 +49,9 @@ DocumentContentFactory::~DocumentContentFactory() } - // XServiceInfo methods. - // virtual OUString SAL_CALL DocumentContentFactory::getImplementationName() throw ( uno::RuntimeException, std::exception ) @@ -99,11 +93,9 @@ DocumentContentFactory::getSupportedServiceNames_Static() } - // XTransientDocumentsDocumentContentFactory methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL DocumentContentFactory::createDocumentContent( @@ -131,11 +123,9 @@ DocumentContentFactory::createDocumentContent( } - // Service factory implementation. - static uno::Reference< uno::XInterface > SAL_CALL DocumentContentFactory_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index 9398d5d23157..3e497f9a243b 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -74,19 +74,12 @@ namespace tdoc_ucp } // namespace tdoc_ucp - - // InteractionSupplyPassword Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionSupplyPassword::acquire() throw() @@ -118,11 +111,9 @@ InteractionSupplyPassword::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyPassword::getImplementationId() @@ -152,11 +143,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionSupplyPassword::select() throw( uno::RuntimeException, std::exception ) @@ -165,11 +154,9 @@ void SAL_CALL InteractionSupplyPassword::select() } - // XInteractionPassword methods. - // virtual void SAL_CALL InteractionSupplyPassword::setPassword( const OUString& aPasswd ) @@ -188,13 +175,9 @@ OUString SAL_CALL InteractionSupplyPassword::getPassword() } - - // DocumentPasswordRequest Implementation. - - DocumentPasswordRequest::DocumentPasswordRequest( task::PasswordRequestMode eMode, const OUString & rDocumentName ) diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index f6983ab6b7c6..844dea93af43 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -43,13 +43,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // ContentProvider Implementation. - - ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) : ::ucbhelper::ContentProviderImplHelper( rxContext ), @@ -67,7 +63,6 @@ ContentProvider::~ContentProvider() } - // XInterface methods. void SAL_CALL ContentProvider::acquire() throw() @@ -96,7 +91,6 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r // XTypeProvider methods. - XTYPEPROVIDER_IMPL_4( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, @@ -104,30 +98,24 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, frame::XTransientDocumentsDocumentContentFactory ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ), TDOC_CONTENT_PROVIDER_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( @@ -161,11 +149,9 @@ ContentProvider::queryContent( } - // XTransientDocumentsDocumentContentFactory methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::createDocumentContent( @@ -227,11 +213,9 @@ ContentProvider::createDocumentContent( } - // interface OfficeDocumentsEventListener - // virtual void ContentProvider::notifyDocumentClosed( const OUString & rDocId ) { @@ -329,11 +313,9 @@ void ContentProvider::notifyDocumentOpened( const OUString & rDocId ) } - // Non-UNO - uno::Reference< embed::XStorage > ContentProvider::queryStorage( const OUString & rUri, StorageAccessMode eMode ) const diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index 3fa3f91d6ee5..68b3950f2760 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -39,7 +39,6 @@ namespace com { namespace sun { namespace star { namespace frame { namespace tdoc_ucp { - #define TDOC_CONTENT_PROVIDER_SERVICE_NAME \ "com.sun.star.ucb.TransientDocumentsContentProvider" @@ -53,7 +52,6 @@ namespace tdoc_ucp { "application/" TDOC_URL_SCHEME "-stream" - class StorageElementFactory; class ContentProvider : diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx index e7c4bdb2beed..5a9a2f119f9b 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx @@ -38,13 +38,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -55,11 +51,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index f8a558ebc761..3199e9e99a8d 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -60,7 +60,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucptdoc1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index 91dd5714e44a..5007c9ac8e59 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -39,13 +39,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // ParentStorageHolder Implementation. - - ParentStorageHolder::ParentStorageHolder( const uno::Reference< embed::XStorage > & xParentStorage, const OUString & rUri ) @@ -58,13 +54,9 @@ ParentStorageHolder::ParentStorageHolder( } - - // Storage Implementation. - - Storage::Storage( const uno::Reference< uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, const OUString & rUri, @@ -149,11 +141,9 @@ Storage::~Storage() } - // uno::XInterface - // virtual uno::Any SAL_CALL Storage::queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException, std::exception ) @@ -192,11 +182,9 @@ void SAL_CALL Storage::release() } - // lang::XTypeProvider - // virtual uno::Sequence< uno::Type > SAL_CALL Storage::getTypes() throw ( uno::RuntimeException, std::exception ) @@ -213,7 +201,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() } - // lang::XComponent (base of embed::XStorage) @@ -242,11 +229,9 @@ void SAL_CALL Storage::removeEventListener( } - // container::XElementAccess (base of container::XNameAccess) - // virtual uno::Type SAL_CALL Storage::getElementType() throw ( uno::RuntimeException, std::exception ) @@ -263,11 +248,9 @@ sal_Bool SAL_CALL Storage::hasElements() } - // container::XNameAccess (base of embed::XStorage) - // virtual uno::Any SAL_CALL Storage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, @@ -294,11 +277,9 @@ sal_Bool SAL_CALL Storage::hasByName( const OUString& aName ) } - // embed::XStorage - // virtual void SAL_CALL Storage::copyToStorage( const uno::Reference< embed::XStorage >& xDest ) @@ -501,11 +482,9 @@ void SAL_CALL Storage::moveElementTo( } - // embed::XTransactedObject - // virtual void SAL_CALL Storage::commit() throw ( io::IOException, @@ -567,13 +546,9 @@ void SAL_CALL Storage::revert() } - - // OutputStream Implementation. - - OutputStream::OutputStream( const uno::Reference< uno::XComponentContext > & rxContext, const OUString & rUri, @@ -634,11 +609,9 @@ OutputStream::~OutputStream() } - // uno::XInterface - // virtual uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException, std::exception ) @@ -655,11 +628,9 @@ uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) } - // lang::XTypeProvider - // virtual uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes() throw ( uno::RuntimeException, std::exception ) @@ -676,11 +647,9 @@ uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId() } - // io::XOutputStream - // virtual void SAL_CALL OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) @@ -721,11 +690,9 @@ OutputStream::closeOutput( ) } - // lang::XComponent - // virtual void SAL_CALL OutputStream::dispose() @@ -759,13 +726,9 @@ OutputStream::removeEventListener( } - - // Stream Implementation. - - Stream::Stream( const uno::Reference< uno::XComponentContext > & rxContext, const OUString & rUri, @@ -829,11 +792,9 @@ Stream::~Stream() } - // uno::XInterface - // virtual uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException, std::exception ) @@ -850,11 +811,9 @@ uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) } - // lang::XTypeProvider - // virtual uno::Sequence< uno::Type > SAL_CALL Stream::getTypes() throw ( uno::RuntimeException, std::exception ) @@ -871,11 +830,9 @@ uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId() } - // io::XStream. - // virtual uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream() throw( uno::RuntimeException, std::exception ) @@ -892,11 +849,9 @@ uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream() } - // io::XOutputStream. - // virtual void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) throw( io::NotConnectedException, @@ -945,11 +900,9 @@ void SAL_CALL Stream::closeOutput() } - // io::XTruncate. - // virtual void SAL_CALL Stream::truncate() throw( io::IOException, @@ -963,11 +916,9 @@ void SAL_CALL Stream::truncate() } - // io::XInputStream. - // virtual sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) @@ -1023,11 +974,9 @@ void SAL_CALL Stream::closeInput() } - // lang::XComponent - // virtual void SAL_CALL Stream::dispose() throw ( uno::RuntimeException, std::exception ) @@ -1058,11 +1007,9 @@ void SAL_CALL Stream::removeEventListener( } - // Non-UNO - void Stream::commitChanges() throw( io::IOException ) { diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index f92b86fa037c..2e685032dcd6 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -44,7 +44,6 @@ struct MutexHolder }; - class ParentStorageHolder : public MutexHolder { public: @@ -66,7 +65,6 @@ private: }; - typedef cppu::WeakImplHelper< css::embed::XStorage, @@ -288,7 +286,6 @@ private: }; - typedef cppu::WeakImplHelper< css::io::XOutputStream, @@ -363,7 +360,6 @@ private: }; - typedef cppu::WeakImplHelper< css::io::XStream, css::io::XOutputStream, css::io::XTruncate, diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index f43bee85815f..1356d93e6997 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -35,14 +35,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - - // StorageElementFactory Implementation. - - StorageElementFactory::StorageElementFactory( const uno::Reference< uno::XComponentContext > & rxContext, const rtl::Reference< OfficeDocumentsManager > & xDocsMgr ) @@ -358,11 +353,9 @@ void StorageElementFactory::releaseElement( Storage * pElement ) } - // Non-UNO interface - uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx index a5eecc14156b..5ae5a5cec9f9 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.cxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx @@ -32,13 +32,9 @@ using namespace tdoc_ucp; - - // Uri Implementation. - - void Uri::init() const { // Already inited? diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx index 39da47e9deb5..4d1c671e1a4b 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.hxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx @@ -25,12 +25,10 @@ namespace tdoc_ucp { - #define TDOC_URL_SCHEME "vnd.sun.star.tdoc" #define TDOC_URL_SCHEME_LENGTH 17 - class Uri { enum State { UNKNOWN, INVALID, VALID }; diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index f7f97309dae7..1b1bb43ad4d4 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -80,13 +80,9 @@ Important: HTTP headers will not be mapped to DAV properties; only to UCB */ - - // ContentProperties Implementation. - - // static member! uno::Any ContentProperties::m_aEmptyAny; @@ -520,13 +516,9 @@ void ContentProperties::addProperty( const OUString & rName, } - - // CachableContentProperties Implementation. - - namespace { bool isCachable( OUString const & rName, diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx index 36a902cd1fea..d40b8ae8dfc1 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx @@ -37,16 +37,9 @@ namespace webdav_ucp { - - - - // class DAVAuthListenerImpl. - - - class DAVAuthListener_Impl : public DAVAuthListener { public: diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx index b2f878eb9fef..6abf981e0047 100644 --- a/ucb/source/ucp/webdav-neon/DAVException.hxx +++ b/ucb/source/ucp/webdav-neon/DAVException.hxx @@ -102,7 +102,6 @@ const sal_uInt16 SC_HTTP_VERSION_NOT_SUPPORTED = 505; const sal_uInt16 SC_INSUFFICIENT_STORAGE = 507; - class DAVException : public std::exception { public: diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 2079fbd9f893..7395bd2bb76a 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -43,14 +43,9 @@ using namespace webdav_ucp; using namespace com::sun::star; - - // DAVAuthListener_Impl Implementation. - - - // virtual int DAVAuthListener_Impl::authenticate( const OUString & inRealm, @@ -130,14 +125,9 @@ int DAVAuthListener_Impl::authenticate( } - - // DAVResourceAccess Implementation. - - - DAVResourceAccess::DAVResourceAccess( const uno::Reference< uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx index b75fee4b5f9b..2551fa53cfd7 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx @@ -36,7 +36,6 @@ using namespace webdav_ucp; using namespace com::sun::star; - struct LinkSequenceParseContext { ucb::Link * pLink; diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx index 2f7ac4182804..d27f6b212924 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx @@ -35,7 +35,6 @@ using namespace webdav_ucp; using namespace com::sun::star; - struct LockEntrySequenceParseContext { ucb::LockEntry * pEntry; diff --git a/ucb/source/ucp/webdav-neon/PropertyMap.hxx b/ucb/source/ucp/webdav-neon/PropertyMap.hxx index 27def70db167..c0c31bb410d4 100644 --- a/ucb/source/ucp/webdav-neon/PropertyMap.hxx +++ b/ucb/source/ucp/webdav-neon/PropertyMap.hxx @@ -36,7 +36,6 @@ namespace webdav_ucp { - struct equalPropertyName { bool operator()( const css::beans::Property & p1, diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index 22acd274610b..f312d50df046 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -37,7 +37,6 @@ using namespace webdav_ucp; using namespace com::sun::star; - struct UCBDeadPropertyValueParseContext { OUString * pType; diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index f742eceac046..cab727c141b3 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -96,9 +96,6 @@ using namespace webdav_ucp; // Content Implementation. - - - // ctr for content on an existing webdav resource Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, @@ -168,11 +165,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -230,11 +225,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -328,11 +321,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -350,11 +341,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) @@ -380,11 +369,9 @@ OUString SAL_CALL Content::getContentType() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -754,11 +741,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XPropertyContainer methods. - void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( beans::PropertyExistException, @@ -1014,11 +999,9 @@ void SAL_CALL Content::removeProperty( const OUString& Name ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -1135,11 +1118,9 @@ OUString Content::getParentURL() } - // Non-interface methods. - // static uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Reference< uno::XComponentContext >& rxContext, diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index 90a57e5611db..0dc43b5dee03 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -63,12 +63,10 @@ namespace webdav_ucp { - // UNO service name for the content. #define WEBDAV_CONTENT_SERVICE_NAME "com.sun.star.ucb.WebDAVContent" - class ContentProvider; class ContentProperties; class CachableContentProperties; diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 03f309a00d3c..10b4cec3555e 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -57,11 +57,9 @@ using namespace com::sun::star; using namespace webdav_ucp; - // ContentProvider implementation. - bool ContentProvider::getProperty( const OUString & rPropName, beans::Property & rProp, bool bStrict ) { @@ -286,11 +284,9 @@ bool ContentProvider::getProperty( } - // Content implementation. - // virtual uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index c3b4e04826a1..ab883d519720 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -53,11 +53,9 @@ namespace webdav_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aId; @@ -72,19 +70,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector<std::unique_ptr<ResultListEntry>> ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -106,13 +100,9 @@ struct DataSupplier_Impl } - - // DataSupplier Implementation. - - DataSupplier::DataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index caeeac3d5b76..be6b50406832 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -43,13 +43,9 @@ using namespace com::sun::star; using namespace webdav_ucp; - - // ContentProvider Implementation. - - ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) : ::ucbhelper::ContentProviderImplHelper( rxContext ), @@ -66,7 +62,6 @@ ContentProvider::~ContentProvider() } - // XInterface methods. void SAL_CALL ContentProvider::acquire() @@ -95,36 +90,29 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, ucb::XContentProvider ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.WebDAVContentProvider" ), WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index bdf929a18cdf..2cb16a4fc899 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -39,7 +39,6 @@ namespace webdav_ucp { - // UNO service name for the provider. This name will be used by the UCB to // create instances of the provider. #define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME "com.sun.star.ucb.WebDAVContentProvider" @@ -71,7 +70,6 @@ namespace webdav_ucp { #define WEBDAV_COLLECTION_TYPE "application/" WEBDAV_URL_SCHEME "-collection" - class ContentProvider : public ::ucbhelper::ContentProviderImplHelper { rtl::Reference< DAVSessionFactory > m_xDAVSessionFactory; diff --git a/ucb/source/ucp/webdav-neon/webdavresultset.cxx b/ucb/source/ucp/webdav-neon/webdavresultset.cxx index 53a7bbd7af55..a4135564fb1b 100644 --- a/ucb/source/ucp/webdav-neon/webdavresultset.cxx +++ b/ucb/source/ucp/webdav-neon/webdavresultset.cxx @@ -43,13 +43,9 @@ using namespace com::sun::star; using namespace webdav_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -62,11 +58,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/webdav-neon/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx index cd3468788fe5..3645824e4c68 100644 --- a/ucb/source/ucp/webdav-neon/webdavservices.cxx +++ b/ucb/source/ucp/webdav-neon/webdavservices.cxx @@ -55,7 +55,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index b63c51ba1448..cb30d9affd5d 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -65,13 +65,9 @@ Important: HTTP headers will not be mapped to DAV properties; only to UCB */ - - // ContentProperties Implementation. - - // static member! uno::Any ContentProperties::m_aEmptyAny; @@ -535,13 +531,9 @@ void ContentProperties::addProperty( const OUString & rName, } - - // CachableContentProperties Implementation. - - namespace { bool isCachable( OUString const & rName, diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 0287f09f45bd..5092a4f0be28 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_CONTENTPROPERTIES_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_CONTENTPROPERTIES_HXX diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 877b88712522..3179407c8b21 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVAUTHLISTENERIMPL_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVAUTHLISTENERIMPL_HXX @@ -29,16 +28,9 @@ namespace http_dav_ucp { - - - - // class DAVAuthListenerImpl. - - - class DAVAuthListener_Impl : public DAVAuthListener { public: diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx index 6aac85f452cf..74fc3f78b380 100644 --- a/ucb/source/ucp/webdav/DAVException.hxx +++ b/ucb/source/ucp/webdav/DAVException.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVEXCEPTION_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVEXCEPTION_HXX @@ -94,7 +93,6 @@ const sal_uInt16 SC_HTTP_VERSION_NOT_SUPPORTED = 505; const sal_uInt16 SC_INSUFFICIENT_STORAGE = 507; - class DAVException : public std::exception { public: diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx index 5e91ba43382d..aca9f38465dd 100644 --- a/ucb/source/ucp/webdav/DAVResource.hxx +++ b/ucb/source/ucp/webdav/DAVResource.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCE_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCE_HXX diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index b18a50456a06..87447f2dcf2c 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -32,14 +32,9 @@ using namespace http_dav_ucp; using namespace com::sun::star; - - // DAVAuthListener_Impl Implementation. - - - // virtual int DAVAuthListener_Impl::authenticate( const OUString & inRealm, @@ -122,14 +117,9 @@ int DAVAuthListener_Impl::authenticate( } - - // DAVResourceAccess Implementation. - - - DAVResourceAccess::DAVResourceAccess( const uno::Reference< uno::XComponentContext > & rContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index b2f1af6a8c61..72c55149d43d 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCEACCESS_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCEACCESS_HXX diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index 83caf7c92c51..fc6e4c18a4e8 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVSESSION_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVSESSION_HXX diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx index e0130ab995a9..3cce18abb724 100644 --- a/ucb/source/ucp/webdav/DAVTypes.hxx +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVTYPES_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVTYPES_HXX diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx index 91d1e2be9bc5..32beb736ee24 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DATETIMEHELPER_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DATETIMEHELPER_HXX diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx index 63f345810a02..7438566f732f 100644 --- a/ucb/source/ucp/webdav/PropertyMap.hxx +++ b/ucb/source/ucp/webdav/PropertyMap.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_PROPERTYMAP_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_PROPERTYMAP_HXX diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 66ef8bb8c20f..2575cb08227e 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; using namespace http_dav_ucp; - // Constructor SerfInputStream::SerfInputStream() diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 0535db45b4b8..29262d650d1b 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -213,7 +213,6 @@ char* SerfSession::getHostinfo() } - // virtual bool SerfSession::CanUse( const OUString & inUri ) { @@ -771,7 +770,6 @@ SerfSession::GET( const OUString & inPath, } - // GET void SerfSession::GET( const OUString & inPath, diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index bf0ee4f0d99e..688db55b5d4b 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_SERFSESSION_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_SERFSESSION_HXX diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx index c1cd5addfd9c..dc066f48afee 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_UCBDEADPROPERTYVALUE_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_UCBDEADPROPERTYVALUE_HXX diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index f35c3d99a6bb..c5b033e78f46 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -188,14 +188,9 @@ static void lcl_sendPartialGETRequest( bool &bError, } - - // Content Implementation. - - - // ctr for content on an existing webdav resource Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, @@ -266,11 +261,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -335,11 +328,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -433,11 +424,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) @@ -455,11 +444,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) @@ -485,11 +472,9 @@ OUString SAL_CALL Content::getContentType() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -842,11 +827,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XPropertyContainer methods. - void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( beans::PropertyExistException, @@ -1118,11 +1101,9 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -1242,11 +1223,9 @@ OUString Content::getParentURL() } - // Non-interface methods. - // static uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Reference< uno::XComponentContext >& rxContext, diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 5aa918015156..3b6cf4c202ef 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVCONTENT_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVCONTENT_HXX @@ -55,12 +54,10 @@ namespace http_dav_ucp { - // UNO service name for the content. #define WEBDAV_CONTENT_SERVICE_NAME "com.sun.star.ucb.WebDAVContent" - class ContentProvider; class ContentProperties; class CachableContentProperties; diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 6723d459696f..08e95e2fa051 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -41,11 +41,9 @@ using namespace com::sun::star; using namespace http_dav_ucp; - // ContentProvider implementation. - bool ContentProvider::getProperty( const OUString & rPropName, beans::Property & rProp, bool bStrict ) { @@ -261,11 +259,9 @@ bool ContentProvider::getProperty( } - // Content implementation. - // virtual uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index c2ad2a1cbd61..05566de0e5ff 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -34,11 +34,9 @@ namespace http_dav_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aId; @@ -52,19 +50,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -100,13 +94,9 @@ DataSupplier_Impl::~DataSupplier_Impl() } - - // DataSupplier Implementation. - - DataSupplier::DataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index b22f110d90d7..50a7fc7cff09 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVDATASUPPLIER_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVDATASUPPLIER_HXX diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 9d1a71ba6321..27250824741e 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -34,8 +34,6 @@ using namespace http_dav_ucp; // ContentProvider Implementation. - - ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rContext ) : ::ucbhelper::ContentProviderImplHelper( rContext ), @@ -52,7 +50,6 @@ ContentProvider::~ContentProvider() } - // XInterface methods. void SAL_CALL ContentProvider::acquire() throw() @@ -80,36 +77,29 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, ucb::XContentProvider ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.WebDAVContentProvider" ), WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index 47521d6ae468..bfe65511fa62 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVPROVIDER_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVPROVIDER_HXX @@ -31,7 +30,6 @@ namespace http_dav_ucp { - // UNO service name for the provider. This name will be used by the UCB to // create instances of the provider. #define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME "com.sun.star.ucb.WebDAVContentProvider" @@ -61,7 +59,6 @@ namespace http_dav_ucp { #define WEBDAV_COLLECTION_TYPE "application/" WEBDAV_URL_SCHEME "-collection" - class ContentProvider : public ::ucbhelper::ContentProviderImplHelper { rtl::Reference< DAVSessionFactory > m_xDAVSessionFactory; diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx index 42b5874dc6be..cc19f191151a 100644 --- a/ucb/source/ucp/webdav/webdavresultset.cxx +++ b/ucb/source/ucp/webdav/webdavresultset.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; using namespace http_dav_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -53,11 +49,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx index 31b1a01c3d96..cb1b7c0f5c97 100644 --- a/ucb/source/ucp/webdav/webdavresultset.hxx +++ b/ucb/source/ucp/webdav/webdavresultset.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVRESULTSET_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVRESULTSET_HXX diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 6516603bf1d7..1b849e15c660 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -45,7 +45,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 6a5b09f71896..aa5dc9685d3d 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -126,14 +126,9 @@ void EmptyInputStream::closeInput() } - - - // class ContentEventListener_Impl. - - class ContentEventListener_Impl : public cppu::OWeakObject, public XContentEventListener { @@ -161,13 +156,9 @@ public: }; - - // class Content_Impl. - - class Content_Impl : public salhelper::SimpleReferenceObject { friend class ContentEventListener_Impl; @@ -306,13 +297,9 @@ static Reference< XContent > getContentNoThrow( } - - // Content Implementation. - - Content::Content() : m_xImpl( new Content_Impl ) { @@ -1069,7 +1056,6 @@ bool Content::isFolder() } - SAL_WNOUNREACHABLE_CODE_PUSH bool Content::isDocument() @@ -1121,8 +1107,6 @@ void Content::unlock() // Content_Impl Implementation. - - Content_Impl::Content_Impl( const Reference< XComponentContext >& rCtx, const Reference< XContent >& rContent, const Reference< XCommandEnvironment >& rEnv ) @@ -1337,15 +1321,9 @@ void Content_Impl::inserted() } - - // ContentEventListener_Impl Implementation. - - - - // XInterface methods. void SAL_CALL ContentEventListener_Impl::acquire() @@ -1373,7 +1351,6 @@ css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno // XContentEventListener methods. - // virtual void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) throw( RuntimeException, std::exception ) @@ -1397,11 +1374,9 @@ void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) } - // XEventListenr methods. - // virtual void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source ) throw( RuntimeException, std::exception ) diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index b51e88988ef1..1ce21f7e98de 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -74,7 +74,6 @@ public: typedef std::pair< WildCard, WildCard > NoProxyListEntry; - class HostnameCache { typedef std::pair< OUString, OUString > HostListEntry; @@ -156,13 +155,9 @@ private: }; - - // WildCard Implementation. - - bool WildCard::Matches( const OUString& rString ) const { OString aString @@ -287,13 +282,9 @@ bool getConfigInt32Value( } - - // InternetProxyDecider_Impl Implementation. - - InternetProxyDecider_Impl::InternetProxyDecider_Impl( const uno::Reference< uno::XComponentContext >& rxContext ) : m_nProxyType( 0 ), @@ -529,7 +520,6 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( // in: staroffice-doc.germany.sun.com -> full: xyz.germany.sun.com - if ( !shouldUseProxy( aFullyQualifiedHost, nPort, true ) ) return m_aEmptyProxy; } @@ -777,13 +767,9 @@ void InternetProxyDecider_Impl::setNoProxyList( } // namespace proxydecider_impl - - // InternetProxyDecider Implementation. - - InternetProxyDecider::InternetProxyDecider( const uno::Reference< uno::XComponentContext>& rxContext ) : m_pImpl( new proxydecider_impl::InternetProxyDecider_Impl( rxContext ) ) diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index fecfb5d8a2ab..db1de0cc53d4 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -80,7 +80,6 @@ void cancelCommandExecution( const uno::Any & rException, } - void cancelCommandExecution( const ucb::IOErrorCode eError, const uno::Sequence< uno::Any > & rArgs, const uno::Reference< diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index b40f28e434c4..c12af5dfe8d3 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -38,13 +38,9 @@ namespace ucbhelper { - - // struct ContentIdentifier_Impl. - - struct ContentIdentifier_Impl { OUString m_aContentId; @@ -55,11 +51,9 @@ struct ContentIdentifier_Impl }; - // ContentIdentifier_Impl Implementation. - ContentIdentifier_Impl::ContentIdentifier_Impl(const OUString& rURL ) { // Normalize URL scheme ( it's case insensitive ). @@ -76,11 +70,9 @@ ContentIdentifier_Impl::ContentIdentifier_Impl(const OUString& rURL ) } - // ContentIdentifier Implementation. - ContentIdentifier::ContentIdentifier( const OUString& rURL ) : m_pImpl( new ContentIdentifier_Impl( rURL ) ) { @@ -93,12 +85,9 @@ ContentIdentifier::~ContentIdentifier() } - // XInterface methods. - - // virtual void SAL_CALL ContentIdentifier::acquire() throw() { @@ -126,11 +115,9 @@ ContentIdentifier::queryInterface( const Type & rType ) } - // XTypeProvider methods. - // virtual Sequence< sal_Int8 > SAL_CALL ContentIdentifier::getImplementationId() @@ -161,11 +148,9 @@ ContentIdentifier::getTypes() } - // XContentIdentifier methods. - // virtual OUString SAL_CALL ContentIdentifier::getContentIdentifier() throw( RuntimeException, std::exception ) diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 4b3987ccd3bd..daeccdfcfb7e 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -33,13 +33,9 @@ using namespace com::sun::star; - - // PropertySetInfo Implementation. - - namespace ucbhelper { PropertySetInfo::PropertySetInfo( @@ -59,7 +55,6 @@ PropertySetInfo::~PropertySetInfo() } - // XInterface methods. void SAL_CALL PropertySetInfo::acquire() @@ -93,7 +88,6 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo, // XPropertySetInfo methods. - // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() throw( uno::RuntimeException, std::exception ) @@ -182,11 +176,9 @@ sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( } - // Non-Interface methods. - void PropertySetInfo::reset() { osl::MutexGuard aGuard( m_aMutex ); @@ -218,13 +210,9 @@ bool PropertySetInfo::queryProperty( } - - // CommandProcessorInfo Implementation. - - CommandProcessorInfo::CommandProcessorInfo( const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ) @@ -242,7 +230,6 @@ CommandProcessorInfo::~CommandProcessorInfo() } - // XInterface methods. @@ -271,17 +258,14 @@ css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const css::uno::Typ // XTypeProvider methods. - XTYPEPROVIDER_IMPL_2( CommandProcessorInfo, lang::XTypeProvider, css::ucb::XCommandInfo ); - // XCommandInfo methods. - // virtual uno::Sequence< css::ucb::CommandInfo > SAL_CALL CommandProcessorInfo::getCommands() @@ -364,11 +348,9 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) } - // Non-Interface methods. - void CommandProcessorInfo::reset() { osl::MutexGuard aGuard( m_aMutex ); @@ -377,7 +359,6 @@ void CommandProcessorInfo::reset() } - bool CommandProcessorInfo::queryCommand( const OUString& rName, css::ucb::CommandInfo& rCommand ) diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index f4f708501cbb..948cc913ba84 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -93,7 +93,6 @@ namespace ucbhelper } - void SAL_CALL FdInputStream::skipBytes(sal_Int32 nBytesToSkip) throw(NotConnectedException, BufferSizeExceededException, @@ -109,7 +108,6 @@ namespace ucbhelper } - sal_Int32 SAL_CALL FdInputStream::available() throw(NotConnectedException, IOException, @@ -119,7 +117,6 @@ namespace ucbhelper } - void SAL_CALL FdInputStream::closeInput() throw(NotConnectedException, IOException, @@ -131,7 +128,6 @@ namespace ucbhelper } - void SAL_CALL FdInputStream::seek(sal_Int64 location) throw( IllegalArgumentException, IOException, @@ -146,7 +142,6 @@ namespace ucbhelper } - sal_Int64 SAL_CALL FdInputStream::getPosition( void ) @@ -163,7 +158,6 @@ namespace ucbhelper } - sal_Int64 SAL_CALL FdInputStream::getLength( void ) throw( diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index b3bf575d3e63..5df31a75c0aa 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; using namespace ucbhelper; - - // InteractionRequest Implementation. - - namespace ucbhelper { @@ -106,11 +102,9 @@ void InteractionRequest::setSelection( } - // XInterface methods. - // virtual void SAL_CALL InteractionRequest::acquire() throw() @@ -140,11 +134,9 @@ InteractionRequest::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -173,11 +165,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes() } - // XInteractionRequest methods. - // virtual uno::Any SAL_CALL InteractionRequest::getRequest() throw( uno::RuntimeException, std::exception ) @@ -230,19 +220,12 @@ void InteractionContinuation::recordSelection() } - - // InteractionAbort Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionAbort::acquire() throw() @@ -274,11 +257,9 @@ InteractionAbort::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -307,11 +288,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionAbort::select() throw( uno::RuntimeException, std::exception ) @@ -320,19 +299,12 @@ void SAL_CALL InteractionAbort::select() } - - // InteractionRetry Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionRetry::acquire() throw() @@ -364,11 +336,9 @@ InteractionRetry::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -397,11 +367,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionRetry::select() throw( uno::RuntimeException, std::exception ) @@ -410,19 +378,12 @@ void SAL_CALL InteractionRetry::select() } - - // InteractionApprove Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionApprove::acquire() throw() @@ -454,11 +415,9 @@ InteractionApprove::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -487,11 +446,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionApprove::select() throw( uno::RuntimeException, std::exception ) @@ -500,19 +457,12 @@ void SAL_CALL InteractionApprove::select() } - - // InteractionDisapprove Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionDisapprove::acquire() throw() @@ -544,11 +494,9 @@ InteractionDisapprove::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -577,11 +525,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionDisapprove::select() throw( uno::RuntimeException, std::exception ) @@ -590,19 +536,12 @@ void SAL_CALL InteractionDisapprove::select() } - - // InteractionSupplyAuthentication Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionSupplyAuthentication::acquire() throw() @@ -635,11 +574,9 @@ InteractionSupplyAuthentication::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyAuthentication::getImplementationId() @@ -669,11 +606,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionSupplyAuthentication::select() throw( uno::RuntimeException, std::exception ) @@ -682,11 +617,9 @@ void SAL_CALL InteractionSupplyAuthentication::select() } - // XInteractionSupplyAuthentication methods. - // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canSetRealm() @@ -816,11 +749,9 @@ void SAL_CALL InteractionSupplyAuthentication::setRememberAccount( } - // XInteractionSupplyAuthentication2 methods. - // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canUseSystemCredentials( @@ -842,20 +773,12 @@ void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials( } - - - // InteractionReplaceExistingData Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionReplaceExistingData::acquire() throw() @@ -887,11 +810,9 @@ InteractionReplaceExistingData::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionReplaceExistingData::getImplementationId() @@ -921,11 +842,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionReplaceExistingData::select() throw( uno::RuntimeException, std::exception ) diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 9756dc24136e..142e14282b7e 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -48,11 +48,9 @@ namespace ucbhelper_impl { - // PropertyValue. - const sal_uInt32 NO_VALUE_SET = 0x00000000; const sal_uInt32 STRING_VALUE_SET = 0x00000001; const sal_uInt32 BOOLEAN_VALUE_SET = 0x00000002; @@ -127,11 +125,9 @@ class PropertyValues : public std::vector< ucbhelper_impl::PropertyValue > {}; } // namespace ucbhelper - // Welcome to the macro hell... - #define GETVALUE_IMPL_TYPE( _type_, _type_name_, _member_name_, _cppu_type_ ) \ \ osl::MutexGuard aGuard( m_aMutex ); \ @@ -236,14 +232,9 @@ class PropertyValues : public std::vector< ucbhelper_impl::PropertyValue > {}; namespace ucbhelper { - - // PropertyValueSet Implementation. - - - PropertyValueSet::PropertyValueSet( const Reference< XComponentContext >& rxContext ) : m_xContext( rxContext ), @@ -262,7 +253,6 @@ PropertyValueSet::~PropertyValueSet() } - // XInterface methods. void SAL_CALL PropertyValueSet::acquire() throw() @@ -290,18 +280,15 @@ css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( PropertyValueSet, XTypeProvider, XRow, XColumnLocate ); - // XRow methods. - // virtual sal_Bool SAL_CALL PropertyValueSet::wasNull() throw( SQLException, RuntimeException, std::exception ) @@ -593,11 +580,9 @@ Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex ) } - // XColumnLocate methods. - // virtual sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName ) throw( SQLException, RuntimeException, std::exception ) @@ -617,11 +602,9 @@ sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName ) } - // Non-interface methods. - const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter() { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx index d13a7295c1f3..edd19b47d950 100644 --- a/ucbhelper/source/provider/registerucb.cxx +++ b/ucbhelper/source/provider/registerucb.cxx @@ -34,11 +34,9 @@ using namespace com::sun::star; namespace ucbhelper { - // registerAtUcb - bool registerAtUcb( uno::Reference< ucb::XContentProviderManager > const & rManager, diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 8328bac45bdb..48d377444d5f 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; - namespace ucbhelper_impl { @@ -76,11 +75,9 @@ static const PropertyInfo aPropertyTable[] = #define RESULTSET_PROPERTY_COUNT 2 - // class PropertySetInfo - class PropertySetInfo : public cppu::OWeakObject, public lang::XTypeProvider, @@ -140,11 +137,9 @@ namespace ucbhelper { - // struct ResultSet_Impl. - struct ResultSet_Impl { uno::Reference< uno::XComponentContext > m_xContext; @@ -193,13 +188,9 @@ inline ResultSet_Impl::~ResultSet_Impl() } - - // ResultSet Implementation. - - ResultSet::ResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::Property >& rProperties, @@ -231,7 +222,6 @@ ResultSet::~ResultSet() } - // XInterface methods. void SAL_CALL ResultSet::acquire() @@ -266,7 +256,6 @@ css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType ) // XTypeProvider methods. - XTYPEPROVIDER_IMPL_9( ResultSet, lang::XTypeProvider, lang::XServiceInfo, @@ -279,21 +268,17 @@ XTYPEPROVIDER_IMPL_9( ResultSet, beans::XPropertySet ); - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet, OUString("ResultSet"), RESULTSET_SERVICE_NAME ); - // XComponent methods. - // virtual void SAL_CALL ResultSet::dispose() throw( uno::RuntimeException, std::exception ) @@ -346,11 +331,9 @@ void SAL_CALL ResultSet::removeEventListener( } - // XResultSetMetaDataSupplier methods. - // virtual uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -365,11 +348,9 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() } - // XResultSet methods. - // virtual sal_Bool SAL_CALL ResultSet::next() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -767,11 +748,9 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() } - // XRow methods. - // virtual sal_Bool SAL_CALL ResultSet::wasNull() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -1244,11 +1223,9 @@ ResultSet::getArray( sal_Int32 columnIndex ) } - // XCloseable methods. - // virtual void SAL_CALL ResultSet::close() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -1258,11 +1235,9 @@ void SAL_CALL ResultSet::close() } - // XContentAccess methods. - // virtual OUString SAL_CALL ResultSet::queryContentIdentifierString() throw( uno::RuntimeException, std::exception ) @@ -1300,11 +1275,9 @@ ResultSet::queryContent() } - // XPropertySet methods. - // virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSet::getPropertySetInfo() @@ -1450,11 +1423,9 @@ void SAL_CALL ResultSet::removeVetoableChangeListener( } - // Non-interface methods. - void ResultSet::propertyChanged( const beans::PropertyChangeEvent& rEvt ) { if ( !m_pImpl->m_pPropertyChangeListeners ) @@ -1544,13 +1515,9 @@ ResultSet::getEnvironment() namespace ucbhelper_impl { - - // PropertySetInfo Implementation. - - PropertySetInfo::PropertySetInfo( const PropertyInfo* pProps, sal_Int32 nProps ) @@ -1584,7 +1551,6 @@ PropertySetInfo::~PropertySetInfo() } - // XInterface methods. void SAL_CALL PropertySetInfo::acquire() throw() @@ -1612,17 +1578,14 @@ css::uno::Any SAL_CALL PropertySetInfo::queryInterface( // XTypeProvider methods. - XTYPEPROVIDER_IMPL_2( PropertySetInfo, lang::XTypeProvider, beans::XPropertySetInfo ); - // XPropertySetInfo methods. - // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() throw( uno::RuntimeException, std::exception ) diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index c6a8129026cb..abb40a09cdeb 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -39,13 +39,9 @@ using namespace com::sun::star; - - // ResultSetImplHelper Implementation. - - namespace ucbhelper { @@ -68,7 +64,6 @@ ResultSetImplHelper::~ResultSetImplHelper() } - // XInterface methods. void SAL_CALL ResultSetImplHelper::acquire() throw() @@ -97,29 +92,24 @@ css::uno::Any SAL_CALL ResultSetImplHelper::queryInterface( const css::uno::Type // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, lang::XTypeProvider, lang::XServiceInfo, css::ucb::XDynamicResultSet ); - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper, OUString( "ResultSetImplHelper" ), DYNAMICRESULTSET_SERVICE_NAME ); - // XComponent methods. - // virtual void SAL_CALL ResultSetImplHelper::dispose() throw( uno::RuntimeException, std::exception ) @@ -162,11 +152,9 @@ void SAL_CALL ResultSetImplHelper::removeEventListener( } - // XDynamicResultSet methods. - // virtual uno::Reference< sdbc::XResultSet > SAL_CALL ResultSetImplHelper::getStaticResultSet() @@ -274,11 +262,9 @@ void SAL_CALL ResultSetImplHelper::connectToCache( } - // Non-interface methods. - void ResultSetImplHelper::init( bool bStatic ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index e75b8d9c29c3..792000905b2d 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -75,13 +75,9 @@ using namespace ucbhelper_impl; namespace ucbhelper { - - // ResultSetMetaData Implementation. - - ResultSetMetaData::ResultSetMetaData( const Reference< XComponentContext >& rxContext, const Sequence< Property >& rProps, @@ -114,7 +110,6 @@ ResultSetMetaData::~ResultSetMetaData() } - // XInterface methods. void SAL_CALL ResultSetMetaData::acquire() @@ -142,17 +137,14 @@ css::uno::Any SAL_CALL ResultSetMetaData::queryInterface( const css::uno::Type & // XTypeProvider methods. - XTYPEPROVIDER_IMPL_2( ResultSetMetaData, XTypeProvider, XResultSetMetaData ); - // XResultSetMetaData methods. - // virtual sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount() throw( SQLException, RuntimeException, std::exception ) diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 84b35ce5cc90..247bcc682bbe 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -115,7 +115,6 @@ OUString SAL_CALL CBlankNode::getStringValue() throw (css::uno::RuntimeException } // closing anonymous implementation namespace - // component helper namespace namespace comp_CBlankNode { diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 04dd0212322d..858e6a69694c 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -178,7 +178,6 @@ css::uno::Reference< css::rdf::XURI > SAL_CALL CLiteral::getDatatype() throw (cs } // closing anonymous implementation namespace - // component helper namespace namespace comp_CLiteral { diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index c9b7f760450c..beb08614a487 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -804,7 +804,6 @@ OUString SAL_CALL CURI::getLocalName() throw (css::uno::RuntimeException, std::e } // closing anonymous implementation namespace - // component helper namespace namespace comp_CURI { diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 2c627134ac30..1755696e5ddf 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -92,7 +92,6 @@ const char s_sparql [] = "sparql"; const char s_nsOOo [] = "http://openoffice.org/2004/office/rdfa/"; - //FIXME: this approach is not ideal. can we use blank nodes instead? bool isInternalContext(librdf_node *i_pNode) throw () { @@ -117,8 +116,6 @@ bool isInternalContext(librdf_node *i_pNode) throw () } - - // n.b.: librdf destructor functions dereference null pointers! // so they need to be wrapped to be usable with std::shared_ptr. static void safe_librdf_free_world(librdf_world *const world) @@ -168,8 +165,6 @@ static void safe_librdf_free_uri(librdf_uri *const uri) } - - /** converts between librdf types and UNO API types. */ class librdf_TypeConverter @@ -264,8 +259,6 @@ private: }; - - /** implements the repository service. */ class librdf_Repository: @@ -448,8 +441,6 @@ private: }; - - /** result of operations that return a graph, i.e., an XEnumeration of statements. */ @@ -563,8 +554,6 @@ throw (uno::RuntimeException, container::NoSuchElementException, } - - /** result of tuple queries ("SELECT"). */ class librdf_QuerySelectResult: @@ -689,8 +678,6 @@ librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException, std::e } - - /** represents a named graph, and forwards all the work to repository. */ class librdf_NamedGraph: @@ -846,8 +833,6 @@ throw (uno::RuntimeException, } - - std::shared_ptr<librdf_world> librdf_Repository::m_pWorld; sal_uInt32 librdf_Repository::m_NumInstances = 0; osl::Mutex librdf_Repository::m_aMutex; @@ -2430,7 +2415,6 @@ librdf_TypeConverter::convertToStatement(librdf_statement* i_pStmt, } // closing anonymous implementation namespace - // component helper namespace namespace comp_librdf_Repository { diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 19e63efabcf1..762535349cd0 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -780,7 +780,6 @@ UUIInteractionHelper::handleRequest_impl( } - // Handle requests which do not have a plain string representation. if (!bObtainErrorStringOnly) diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 34d099793826..567c401e350e 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -38,9 +38,6 @@ #define LF_NO_USESYSCREDS 0x0100 // hide "use system credentials" - - - class LoginDialog : public ModalDialog { VclPtr<FixedText> m_pErrorFT; @@ -88,11 +85,6 @@ public: }; - - - - - #endif // INCLUDED_UUI_SOURCE_LOGINDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx index 793b965ac5e7..db4ce88d5178 100644 --- a/uui/source/loginerr.hxx +++ b/uui/source/loginerr.hxx @@ -23,7 +23,6 @@ #include <rtl/ustring.hxx> - #define LOGINERROR_FLAG_MODIFY_ACCOUNT 1 #define LOGINERROR_FLAG_MODIFY_USER_NAME 2 #define LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD 4 diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 182f82660762..62b94b9d382b 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -26,7 +26,6 @@ // MasterPasswordCreateDialog--------------------------------------------------- - IMPL_LINK_NOARG_TYPED(MasterPasswordCreateDialog, EditHdl_Impl, Edit&, void) { m_pOKBtn->Enable( m_pEDMasterPasswordCrt->GetText().getLength() >= nMinLen ); diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 5b580945534b..4f055e73c22b 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -25,14 +25,12 @@ // MasterPasswordDialog--------------------------------------------------- - IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void) { EndDialog( RET_OK ); } - MasterPasswordDialog::MasterPasswordDialog ( vcl::Window* pParent, diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index c33649f5708d..2c850d5b0cc7 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -26,7 +26,6 @@ #include <vcl/edit.hxx> - enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; class NameClashDialog : public ModalDialog diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 342aa651f0d7..f7e3d428beb3 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -272,9 +272,6 @@ bool PasswordContainerHelper::addRecord( } - - - PasswordContainerInteractionHandler::PasswordContainerInteractionHandler( const uno::Reference< uno::XComponentContext >& xContext ) : m_aPwContainerHelper( xContext ) @@ -288,11 +285,9 @@ PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler() } - // XServiceInfo methods. - // virtual OUString SAL_CALL PasswordContainerInteractionHandler::getImplementationName() @@ -338,11 +333,9 @@ PasswordContainerInteractionHandler::getSupportedServiceNames_Static() } - // XInteractionHandler2 methods. - // virtual void SAL_CALL PasswordContainerInteractionHandler::handle( @@ -407,11 +400,9 @@ PasswordContainerInteractionHandler::handleInteractionRequest( } - // Service factory implementation. - static uno::Reference< uno::XInterface > SAL_CALL PasswordContainerInteractionHandler_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index a638a9e7a890..42a56e4d3b61 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -41,7 +41,6 @@ namespace com { namespace uui { - /** Passwordcontainer UNO service (com.sun.star.task.PasswordContainer) helper. */ class PasswordContainerHelper @@ -51,7 +50,6 @@ public: css::uno::Reference< css::uno::XComponentContext > const & xContext ); - /** This member function tries to handle an authentication interaction request by looking up credentials for the given URL in the password container service. @@ -121,13 +119,11 @@ public: bool bPersist ); - private: css::uno::Reference< css::task::XPasswordContainer2 > m_xPasswordContainer; }; - class PasswordContainerInteractionHandler : public cppu::WeakImplHelper< css::lang::XServiceInfo, css::task::XInteractionHandler2 > diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 6dfaed4fec8e..742174b80cb6 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -29,7 +29,6 @@ #include <vcl/fixed.hxx> - class PasswordDialog : public ModalDialog { VclPtr<FixedText> m_pFTPassword; diff --git a/uui/source/services.cxx b/uui/source/services.cxx index 162cedba1042..e914508227a9 100644 --- a/uui/source/services.cxx +++ b/uui/source/services.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Char const * pImplName, void * pServiceManager, void *) @@ -75,7 +74,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Cha } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 1e3a55edda88..53da63af1952 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -37,7 +37,6 @@ void SSLWarnDialog::ViewCert() } - SSLWarnDialog::SSLWarnDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext) diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 378b98f45327..9184365a160c 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -28,7 +28,6 @@ using namespace css; - IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, OKHdl_Impl, Button*, void) { if ( m_pOptionButtonAccept->IsChecked() ) @@ -41,7 +40,6 @@ IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, OKHdl_Impl, Button*, void) } - IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void) { uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures( @@ -51,7 +49,6 @@ IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void) } - UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext) diff --git a/vbahelper/source/msforms/vbanewfont.cxx b/vbahelper/source/msforms/vbanewfont.cxx index 5778845c0c28..e9639b4b6dee 100644 --- a/vbahelper/source/msforms/vbanewfont.cxx +++ b/vbahelper/source/msforms/vbanewfont.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - VbaNewFont::VbaNewFont( const uno::Reference< beans::XPropertySet >& rxModelProps ) throw (uno::RuntimeException) : mxProps( rxModelProps, uno::UNO_SET_THROW ) diff --git a/vbahelper/source/msforms/vbanewfont.hxx b/vbahelper/source/msforms/vbanewfont.hxx index a8354c8f55cf..ceebd68c56f9 100644 --- a/vbahelper/source/msforms/vbanewfont.hxx +++ b/vbahelper/source/msforms/vbanewfont.hxx @@ -56,7 +56,6 @@ private: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 003610c9969c..63b9cb0bdfa0 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -253,7 +253,6 @@ ScVbaCommandBarControls::getServiceNames() } - class VbaDummyIndexAccess : public ::cppu::WeakImplHelper< container::XIndexAccess > { public: @@ -271,7 +270,6 @@ public: }; - VbaDummyCommandBarControls::VbaDummyCommandBarControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) : diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index 328ccda87cfe..fb1db5bdcc14 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - VbaEventsHelperBase::VbaEventsHelperBase( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& /*xContext*/ ) : mpShell( nullptr ), mbDisposed( true ) @@ -344,5 +343,4 @@ VbaEventsHelperBase::ModulePathMap& VbaEventsHelperBase::updateModulePathMap( co } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 1622874e7326..721c7f793324 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -885,7 +885,6 @@ double UserFormGeometryHelper::getOffsetY() const } - static const char saPosXName[] = "PositionX"; static const char saPosYName[] = "PositionY"; static const char saWidthName[] = "Width"; @@ -965,7 +964,6 @@ void UserFormGeometryHelper::implSetSize( double fSize, bool bHeight, bool bOute } - double ConcreteXShapeGeometryAttributes::getLeft() const { return m_pShapeHelper->getLeft(); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 8036d1640d1d..7b34014d8ee8 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -104,7 +104,6 @@ static bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, aStr = aStr.trim(); - // find position of decimal point nDecPos = aStr.indexOf( rLocaleDataWrappper.getNumDecimalSep() ); // find position of fraction diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 8d7a503ebe41..103a9259f1e2 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -154,7 +154,6 @@ void GfxLink::SetPrefSize( const Size& rPrefSize ) } - void GfxLink::SetPrefMapMode( const MapMode& rPrefMapMode ) { mpImpData->maPrefMapMode = rPrefMapMode; diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index a9987929ec1c..d8889bb71895 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -78,10 +78,6 @@ void SvtGraphicStroke::getEndArrow( tools::PolyPolygon& rPath ) const } - - - - void SvtGraphicStroke::getDashArray( DashArray& rDashArray ) const { rDashArray = maDashArray; @@ -219,17 +215,12 @@ void SvtGraphicFill::getPath( tools::PolyPolygon& rPath ) const } - - - void SvtGraphicFill::getTransform( Transform& rTrans ) const { rTrans = maFillTransform; } - - void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const { rGraphic = maFillGraphic; diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index aaf884b0005b..d152a0ffd306 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1203,7 +1203,6 @@ void OpenGLContext::setWinSize(const Size& rSize) } - #if defined( WNT ) bool OpenGLContext::initWindow() diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index 2a04b3318791..94dba62444a5 100644 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -75,5 +75,4 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx b/winaccessibility/source/UAccCOM/AccHypertext.cxx index 3e16c6e6066e..1e923c7869dd 100644 --- a/winaccessibility/source/UAccCOM/AccHypertext.cxx +++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::accessibility; using namespace com::sun::star::uno; - /** * Get special selection. * @param startOffset Start selection offset. diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index f89f969625d0..b4fc9603bccc 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::accessibility; // CEnumVariant - /** * enumarate method,get next element * @param cElements The number of elements to be returned. diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 070d0dff4770..dbda3a4b38a6 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -196,7 +196,6 @@ BSTR UNO_ALL_STATES[] = using namespace com::sun::star::accessibility::AccessibleRole; - #define QUERYXINTERFACE(ainterface) \ { \ if(pXAcc == NULL) \ @@ -1232,7 +1231,6 @@ STDMETHODIMP CMAccessible::SetState(DWORD pXSate) } - /** * Set the accessible description of the current COM object self from UNO. * @param pszDescription, the name used to set the description of the current object. diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 97668985bcdf..7feb24686fb2 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -183,7 +183,6 @@ AccObject::~AccObject() } - /** * Insert a child element. * @param pChild Child element that should be inserted into child list. diff --git a/winaccessibility/source/service/AccObjectContainerEventListener.cxx b/winaccessibility/source/service/AccObjectContainerEventListener.cxx index f1a150b3b853..150df1822f56 100644 --- a/winaccessibility/source/service/AccObjectContainerEventListener.cxx +++ b/winaccessibility/source/service/AccObjectContainerEventListener.cxx @@ -20,7 +20,6 @@ // AccObjectContainerEventListener.cpp: implementation of the AccContainerEventListener class. - #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index d21f5f79de75..d13d509801b1 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -84,7 +84,6 @@ void DomainMapperTableHandler::startTable(unsigned int nRows, } - PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntryPtr& rStyleSheet, StyleSheetTablePtr pStyleSheetTable) { PropertyMapPtr pRet; diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx index 4726b5919676..ebd4e2f6538a 100644 --- a/writerfilter/source/dmapper/FFDataHandler.cxx +++ b/writerfilter/source/dmapper/FFDataHandler.cxx @@ -42,10 +42,6 @@ FFDataHandler::~FFDataHandler() } - - - - bool FFDataHandler::getCheckboxChecked() const { if (m_nCheckboxChecked != -1) @@ -57,8 +53,6 @@ bool FFDataHandler::getCheckboxChecked() const } - - void FFDataHandler::lcl_sprm(Sprm & r_Sprm) { switch(r_Sprm.getId()) diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 00517d857399..02dd2e17a599 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1362,7 +1362,6 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b } - void GraphicImport::data(const sal_uInt8* buf, size_t len, writerfilter::Reference<Properties>::Pointer_t /*ref*/) { beans::PropertyValues aMediaProperties( 1 ); diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx index 2d0a5fdbdebe..f3836351e12b 100644 --- a/writerfilter/source/dmapper/MeasureHandler.cxx +++ b/writerfilter/source/dmapper/MeasureHandler.cxx @@ -30,7 +30,6 @@ namespace dmapper { using namespace ::com::sun::star; - MeasureHandler::MeasureHandler() : LoggedProperties("MeasureHandler"), m_nMeasureValue( 0 ), diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx index 372970b30d1d..fc8b6b2b2e23 100644 --- a/writerfilter/source/dmapper/ModelEventListener.cxx +++ b/writerfilter/source/dmapper/ModelEventListener.cxx @@ -36,8 +36,6 @@ namespace dmapper { using namespace ::com::sun::star; - - ModelEventListener::ModelEventListener(bool bIndexes, bool bControls) : m_bIndexes(bIndexes), m_bControls(bControls) diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index c9275755f41e..1ee372b6dc0c 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -388,7 +388,6 @@ void NumPicBullet::SetShape(uno::Reference<drawing::XShape> const& xShape) } - //--------------------------------------- AbstractListDef implementation AbstractListDef::AbstractListDef( ) : @@ -711,7 +710,6 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal ) int nIntValue = rVal.getInt(); - switch(nName) { case NS_ooxml::LN_CT_LevelText_val: diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index e1ff1e636d51..09e6d8f22066 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -54,7 +54,6 @@ namespace writerfilter { namespace dmapper{ - PropertyMap::PropertyMap() : m_cFootnoteSymbol( 0 ), m_nFootnoteFontId( -1 ) @@ -497,7 +496,6 @@ OUString lcl_FindUnusedPageStyleName(const uno::Sequence< OUString >& rPageStyle } - uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( const uno::Reference< container::XNameContainer >& xPageStyles, const uno::Reference < lang::XMultiServiceFactory >& xTextFactory, @@ -704,7 +702,6 @@ void SectionPropertyMap::SetBorderDistance( uno::Reference< beans::XPropertySet } - uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties( uno::Reference< beans::XPropertySet > const& xColumnContainer, DomainMapper_Impl& rDM_Impl ) { @@ -774,7 +771,6 @@ uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties( } - bool SectionPropertyMap::HasHeader(bool bFirstPage) const { bool bRet = false; diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index b739dc00ce7a..ec4531c8f95b 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -351,7 +351,6 @@ public: }; - class ParagraphProperties { bool m_bFrameMode; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 4476b89e5d39..639a4501609d 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -52,7 +52,6 @@ namespace dmapper typedef ::std::map< OUString, OUString> StringPairMap_t; - StyleSheetEntry::StyleSheetEntry() : sStyleIdentifierI() ,sStyleIdentifierD() @@ -263,7 +262,6 @@ PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask } - struct ListCharStylePropertyMap_t { OUString sCharStyleName; diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index dce4d11b7378..274307268356 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -32,7 +32,6 @@ namespace dmapper { using namespace ::com::sun::star; - TDefTableHandler::TDefTableHandler() : LoggedProperties("TDefTableHandler"), m_nLineWidth(0), diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index ed8e7fc98468..8c516ec7905c 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -310,7 +310,6 @@ void OOXMLFastContextHandler::setDefine(Id nDefine) } - void OOXMLFastContextHandler::setToken(Token_t nToken) { mnToken = nToken; diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx index d8cffa4ddf8c..cc794b30a24b 100644 --- a/writerfilter/source/ooxml/OOXMLParserState.cxx +++ b/writerfilter/source/ooxml/OOXMLParserState.cxx @@ -54,7 +54,6 @@ void OOXMLParserState::setLastParagraphInSection(bool bLastParagraphInSection) } - void OOXMLParserState::setInSectionGroup(bool bInSectionGroup) { mbInSectionGroup = bInSectionGroup; diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx index fca4b17be5bc..cfb0a723802e 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx @@ -48,7 +48,6 @@ namespace xmlsearch { }; // end class QueryHit - class QueryHitData { public: diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index bfcdb2e367a8..32463d7beb13 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -116,7 +116,6 @@ void SAL_CALL BufferedInputStream::release() throw() } - sal_Int32 SAL_CALL BufferedInputStream::readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead ) throw( NotConnectedException, BufferSizeExceededException, @@ -153,7 +152,6 @@ sal_Int32 SAL_CALL BufferedInputStream::readSomeBytes( } - void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException, BufferSizeExceededException, @@ -171,7 +169,6 @@ void SAL_CALL BufferedInputStream::skipBytes( sal_Int32 nBytesToSkip ) } - sal_Int32 SAL_CALL BufferedInputStream::available() throw( NotConnectedException, IOException, @@ -182,7 +179,6 @@ sal_Int32 SAL_CALL BufferedInputStream::available() } - void SAL_CALL BufferedInputStream::closeInput() throw( NotConnectedException, IOException, @@ -206,7 +202,6 @@ void SAL_CALL BufferedInputStream::seek( sal_Int64 location ) } - sal_Int64 SAL_CALL BufferedInputStream::getPosition() throw( IOException, RuntimeException, std::exception ) @@ -216,7 +211,6 @@ sal_Int64 SAL_CALL BufferedInputStream::getPosition() } - sal_Int64 SAL_CALL BufferedInputStream::getLength() throw( IOException,RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index af845caacb2f..36b902768100 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; using namespace com::sun::star::ucb; - XInputStream_impl::XInputStream_impl( const OUString& aUncPath ) : m_bIsOpen( false ), m_aFile( aUncPath ) @@ -73,7 +72,6 @@ XInputStream_impl::release( } - sal_Int32 SAL_CALL XInputStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index d014aa3ffa0c..5786b20b9c07 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -76,7 +76,6 @@ ResultSetBase::release( } - uno::Any SAL_CALL ResultSetBase::queryInterface( const uno::Type& rType ) @@ -93,7 +92,6 @@ ResultSetBase::queryInterface( } - // XComponent @@ -124,7 +122,6 @@ ResultSetBase::removeEventListener( } - void SAL_CALL ResultSetBase::dispose() throw( uno::RuntimeException, std::exception ) @@ -149,7 +146,6 @@ ResultSetBase::dispose() } - // XResultSet sal_Bool SAL_CALL @@ -284,8 +280,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row ) } - - sal_Bool SAL_CALL ResultSetBase::relative( sal_Int32 row ) @@ -306,7 +300,6 @@ ResultSetBase::relative( } - sal_Bool SAL_CALL ResultSetBase::previous( void ) @@ -421,7 +414,6 @@ ResultSetBase::queryContent( } - class XPropertySetInfoImpl : public cppu::OWeakObject, public beans::XPropertySetInfo @@ -485,7 +477,6 @@ private: }; - // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSetBase::getPropertySetInfo() @@ -507,7 +498,6 @@ ResultSetBase::getPropertySetInfo() } - void SAL_CALL ResultSetBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw( beans::UnknownPropertyException, @@ -627,7 +617,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener( } - // XResultSetMetaDataSupplier uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSetBase::getMetaData( diff --git a/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx b/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx index dd5e4a79662c..2dba0ec05fb6 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetfactory.hxx @@ -36,11 +36,9 @@ namespace chelp { }; - } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index 15d568ab8923..f13539bd43de 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star; using namespace com::sun::star::ucb; - ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XContentProvider >& xProvider, const uno::Sequence< beans::Property >& seq, diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 75a54dc37187..b2c3da0d7202 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -222,7 +222,6 @@ OUString URLParameter::get_the_tag() } - OUString URLParameter::get_the_path() { if(m_bUseDB) { @@ -237,7 +236,6 @@ OUString URLParameter::get_the_path() } - OUString URLParameter::get_the_title() { if(m_bUseDB) { @@ -314,7 +312,6 @@ void URLParameter::readHelpDataFile() } - // Class encapsulating the transformation of the XInputStream to XHTML @@ -383,7 +380,6 @@ private: }; - void URLParameter::open( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment, @@ -410,7 +406,6 @@ void URLParameter::open( const Command& aCommand, } - void URLParameter::open( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment, @@ -492,7 +487,6 @@ bool URLParameter::module() } - bool URLParameter::name( bool modulePresent ) { // if modulepresent, a name may be present, but must not @@ -954,21 +948,18 @@ Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( } - void SAL_CALL InputStreamTransformer::acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL InputStreamTransformer::release() throw() { OWeakObject::release(); } - sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead ) throw( NotConnectedException, BufferSizeExceededException, @@ -1003,7 +994,6 @@ sal_Int32 SAL_CALL InputStreamTransformer::readSomeBytes( Sequence< sal_Int8 >& } - void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException, BufferSizeExceededException, IOException, @@ -1014,7 +1004,6 @@ void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( } - sal_Int32 SAL_CALL InputStreamTransformer::available() throw( NotConnectedException, IOException, RuntimeException, std::exception ) @@ -1024,7 +1013,6 @@ sal_Int32 SAL_CALL InputStreamTransformer::available() throw( NotConnectedExcept } - void SAL_CALL InputStreamTransformer::closeInput() throw( NotConnectedException, IOException, RuntimeException, std::exception ) @@ -1032,7 +1020,6 @@ void SAL_CALL InputStreamTransformer::closeInput() throw( NotConnectedException, } - void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) @@ -1048,7 +1035,6 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA } - sal_Int64 SAL_CALL InputStreamTransformer::getPosition() throw( IOException, RuntimeException, std::exception ) { @@ -1057,7 +1043,6 @@ sal_Int64 SAL_CALL InputStreamTransformer::getPosition() throw( IOException, } - sal_Int64 SAL_CALL InputStreamTransformer::getLength() throw( IOException,RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index da0819252463..13bdff6dd003 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -106,8 +106,6 @@ namespace chelp { }; - - class URLParameter { public: diff --git a/xmlhelp/source/cxxhelp/test/searchdemo.cxx b/xmlhelp/source/cxxhelp/test/searchdemo.cxx index e2ee86611c09..612418335deb 100644 --- a/xmlhelp/source/cxxhelp/test/searchdemo.cxx +++ b/xmlhelp/source/cxxhelp/test/searchdemo.cxx @@ -36,11 +36,9 @@ using namespace xmlsearch::db; using namespace xmlsearch::qe; - extern RandomAccessStream* theFile(); - void print_rtl_OUString( const OUString bla ) { OString bluber = OString( bla.getStr(),bla.getLength(),RTL_TEXTENCODING_UTF8 ); diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index 4031e46ab867..f61f756a6472 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -23,7 +23,6 @@ #include <xmloff/xmlictxt.hxx> - // forward declarations @@ -62,7 +61,6 @@ public: virtual ~DomBuilderContext(); - // access to the DOM tree @@ -70,7 +68,6 @@ public: com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> getTree(); - // implement SvXMLImportContext methods: diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index 35650f5bc278..d559e4085621 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -119,7 +119,6 @@ public: ::com::sun::star::beans::XPropertySet> & ); - /** * Get a value from the values array. * diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index a3b723e3770c..10f1e091f0d9 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -149,7 +149,6 @@ enum FieldIdEnum { }; - class XMLTextFieldExport { SvXMLExport& rExport; @@ -523,10 +522,6 @@ private: }; - - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 5dd636af7da4..04bc2344d1fc 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -94,7 +94,6 @@ public: }; - /** * abstract parent class for all variable related fields * - variable-set/get/decl (not -decls), @@ -195,7 +194,6 @@ protected: }; - /** import variable get fields (<text:variable-get>) */ class XMLVariableGetFieldImportContext : public XMLVarFieldImportContext { @@ -217,7 +215,6 @@ protected: }; - /** import expression fields (<text:expression>) */ class XMLExpressionFieldImportContext : public XMLVarFieldImportContext { @@ -259,10 +256,6 @@ protected: }; - - - - /** * uperclass for variable/user-set, var/user-input, and sequence fields * inds field master of appropriate type and attaches field to it. @@ -309,7 +302,6 @@ protected: }; - /** import variable set fields (<text:variable-set>) */ class XMLVariableSetFieldImportContext : public XMLSetVarFieldImportContext { @@ -332,7 +324,6 @@ protected: }; - /** variable input fields (<text:variable-input>) */ class XMLVariableInputFieldImportContext : public XMLSetVarFieldImportContext { @@ -357,7 +348,6 @@ protected: }; - /** user fields (<text:user-field-get>) */ class XMLUserFieldImportContext : public XMLSetVarFieldImportContext { @@ -391,7 +381,6 @@ public: }; - /** sequence fields (<text:sequence>) */ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext { @@ -425,10 +414,6 @@ protected: }; - - - - /** * variable declaration container for all variable fields * (variable-decls, user-field-decls, sequence-decls) @@ -493,7 +478,6 @@ public: }; - /** import table formula fields (deprecated; for Writer 2.0 compatibility) */ class XMLTableFormulaImportContext : public XMLTextFieldImportContext { @@ -527,7 +511,6 @@ protected: }; - /** import database display fields (<text:database-display>) */ class XMLDatabaseDisplayImportContext : public XMLDatabaseFieldImportContext { diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 7bb876410044..a52ec70e50eb 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -29,7 +29,6 @@ #include <xmloff/xmltoken.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star; diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index 5e2322e590ac..d3421909be04 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -37,7 +37,6 @@ using ::xmloff::token::XML_GRAPHIC_PROPERTIES; using ::xmloff::token::XML_CHART_PROPERTIES; - void XMLChartStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index 2aa6935027aa..7969b171e471 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -179,7 +179,6 @@ void DomBuilderContext::Characters( const OUString& rCharacters ) } - // helper function implementations diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 1d7d1ae1e623..816334967b0d 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -55,7 +55,6 @@ using std::vector; using namespace com::sun::star::xml::dom; - class DomVisitor { public: @@ -70,7 +69,6 @@ void visit( DomVisitor&, const Reference<XDocument>& ); void visit( DomVisitor&, const Reference<XNode>& ); - void visitNode( DomVisitor& rVisitor, const Reference<XNode>& xNode ) { switch( xNode->getNodeType() ) @@ -126,7 +124,6 @@ void visit( DomVisitor& rVisitor, const Reference<XNode>& xNode ) } - class DomExport: public DomVisitor { SvXMLExport& mrExport; diff --git a/xmloff/source/core/SvXMLAttr.cxx b/xmloff/source/core/SvXMLAttr.cxx index a5be7be2698c..5fa0f5ce5ce4 100644 --- a/xmloff/source/core/SvXMLAttr.cxx +++ b/xmloff/source/core/SvXMLAttr.cxx @@ -35,6 +35,4 @@ bool SvXMLAttr::operator== (const SvXMLAttr &rCmp) const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index 6be5a3c9b850..d9e4b6ecb2a7 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -145,7 +145,6 @@ SvXMLAttributeList::SvXMLAttributeList() } - SvXMLAttributeList::~SvXMLAttributeList() { } diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 738e1ac0d2c2..eebd4ba91746 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -35,7 +35,6 @@ using ::com::sun::star::xml::sax::XLocator; using ::com::sun::star::xml::sax::SAXParseException; - /// ErrorRecord: contains all information for one error @@ -85,8 +84,6 @@ ErrorRecord::~ErrorRecord() } - - XMLErrors::XMLErrors() { } diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index f331e4984128..daf319fa7728 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2533,7 +2533,6 @@ bool SvXMLExport::SetNullDateOnUnitConverter() } - void SvXMLElementExport::StartElement( const sal_uInt16 nPrefixKey, const OUString& rLName, diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 949ac82a47c2..7f47bd717851 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -40,8 +40,6 @@ namespace xmloff { namespace token { } - - #if OSL_DEBUG_LEVEL > 0 #define TOKEN( s, e ) { sizeof(s)-1, s, nullptr, e } #else diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 7c313375eb1a..55f94824b9be 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -94,7 +94,6 @@ static SvXMLTokenMapEntry aImageMapObjectTokenMap[] = }; - class XMLImageMapObjectContext : public SvXMLImportContext { @@ -157,7 +156,6 @@ protected: }; - XMLImageMapObjectContext::XMLImageMapObjectContext( SvXMLImport& rImport, sal_uInt16 nPrefix, @@ -304,7 +302,6 @@ void XMLImageMapObjectContext::Prepare( } - class XMLImageMapRectangleContext : public XMLImageMapObjectContext { awt::Rectangle aRectangle; @@ -336,8 +333,6 @@ protected: }; - - XMLImageMapRectangleContext::XMLImageMapRectangleContext( SvXMLImport& rImport, sal_uInt16 nPrefix, @@ -444,8 +439,6 @@ protected: }; - - XMLImageMapPolygonContext::XMLImageMapPolygonContext( SvXMLImport& rImport, sal_uInt16 nPrefix, @@ -613,15 +606,6 @@ void XMLImageMapCircleContext::Prepare( } - - - - - - - - - XMLImageMapContext::XMLImageMapContext( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 3f42d3adc61a..d753710a10ae 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -142,7 +142,6 @@ void SdXMLLayerContext::EndElement() } - SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&) : SvXMLImportContext(rImport, nPrfx, rLocalName) diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a45d36af00e1..84415738adf9 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1460,7 +1460,6 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co } - SdXMLMasterStylesContext::SdXMLMasterStylesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx index e9dfc24c0a91..c0fc8209ab85 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::document::XEventsSupplier; using ::com::sun::star::lang::IllegalArgumentException; - XMLEventsImportContext::XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx index 382a1908cc4e..8d334469b4a2 100644 --- a/xmloff/source/style/MultiPropertySetHelper.cxx +++ b/xmloff/source/style/MultiPropertySetHelper.cxx @@ -110,7 +110,6 @@ bool MultiPropertySetHelper::checkedProperties() } - void MultiPropertySetHelper::getValues( const Reference<XMultiPropertySet> & rMultiPropertySet ) { diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 27249882f56c..1337227b63ea 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -71,7 +71,6 @@ static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap() } - static const SvXMLEnumMapEntry psXML_BrushHoriPos[] = { { XML_LEFT, GraphicLocation_LEFT_MIDDLE }, diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx index 8127ba5163ea..176936a4830c 100644 --- a/xmloff/source/style/XMLElementPropertyContext.cxx +++ b/xmloff/source/style/XMLElementPropertyContext.cxx @@ -20,7 +20,6 @@ #include "XMLElementPropertyContext.hxx" - XMLElementPropertyContext::XMLElementPropertyContext ( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 75f48c595739..3df2836629d2 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -231,7 +231,6 @@ SvXMLImportContext * XMLFontStyleContextFontFaceSrc::CreateChildContext( } - XMLFontStyleContextFontFaceUri::XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 4a8383baa6d2..83775bdd2976 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -52,8 +52,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; - - XMLFootnoteSeparatorImport::XMLFootnoteSeparatorImport( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 3dc9de47a54b..e4e888020cf7 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -550,7 +550,6 @@ bool SvXMLImportPropertyMapper::_FillPropertySet( } - typedef pair<const OUString*, const Any* > PropertyPair; typedef vector<PropertyPair> PropertyPairs; diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 8f86372d954d..067f07b83759 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -50,7 +50,6 @@ #include <tools/fontenum.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 4d6445f9ee06..d922b4b233d5 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -54,7 +54,6 @@ static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] = }; - class SvxXMLTabStopContext_Impl : public SvXMLImportContext { private: @@ -259,6 +258,4 @@ void SvxXMLTabStopImportContext::EndElement( ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx index 0fae935e9da5..bbf03c0959e0 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -38,7 +38,6 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_HREF; - XMLAutoMarkFileContext::XMLAutoMarkFileContext( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx index ad8babb73adf..56d3f02e2f80 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx @@ -38,8 +38,6 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_EVENT_LISTENERS; - - XMLAutoTextContainerEventImport::XMLAutoTextContainerEventImport( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 69c793650e56..257b5ee0cef8 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -194,7 +194,6 @@ void XMLAutoTextEventExport::exportEvents() } - // methods without content: void XMLAutoTextEventExport::_ExportMeta() {} @@ -206,7 +205,6 @@ void XMLAutoTextEventExport::_ExportMasterStyles() {} void XMLAutoTextEventExport::_ExportContent() {} - // methods to support the component registration Sequence< OUString > SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 2f84a86708d4..714f4c8384d8 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -85,7 +85,6 @@ void XMLAutoTextEventImport::initialize( } - SvXMLImportContext* XMLAutoTextEventImport::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx index 1a2a588af874..c4fcd7f46840 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -31,7 +31,6 @@ #include <xmloff/xmltoken.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index ad97de857083..da88a8e3257d 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -26,7 +26,6 @@ #include <xmloff/xmltoken.hxx> - using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::xmloff::token::IsXMLToken; diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 3ee0bd4e7f58..574818985b04 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star { class XMLChangedRegionImportContext; - /** * Import <text:deletion> and <text:insertion> elements contained in a * <text:changed-region> element. diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index da97ddf420a3..f3e20298c06c 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star { } } } - /** * import change tracking/redlining markers * <text:change>, <text:change-start>, <text:change-end> diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx index c8c85d4d479e..48ec70531c21 100644 --- a/xmloff/source/text/XMLChangeInfoContext.cxx +++ b/xmloff/source/text/XMLChangeInfoContext.cxx @@ -27,14 +27,12 @@ #include <xmloff/xmlimp.hxx> - using namespace ::xmloff::token; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; - XMLChangeInfoContext::XMLChangeInfoContext( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index 729aa7a810b8..c674e7c3d5b3 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star { class XMLChangedRegionImportContext; - /** * Import <office:change-info> elements as children of <text:changed-region> * elements. The attribute values will be passed to the enclosing diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index fc10bbf58b57..a8b54740a5dd 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -39,8 +39,6 @@ using namespace ::com::sun::star; using ::com::sun::star::xml::sax::XAttributeList; - - XMLChangedRegionImportContext::XMLChangedRegionImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx index a7f124bdd6aa..c55e1164caff 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx @@ -31,7 +31,6 @@ using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::xml::sax::XAttributeList; - XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index c38d7f978777..b2edb7c5175d 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -42,7 +42,6 @@ #include <com/sun/star/style/NumberingType.hpp> - using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -108,12 +107,9 @@ void XMLFootnoteConfigHelper::Characters( const OUString& rChars ) } - // XMLFootnoteConfigurationImportContext - - XMLFootnoteConfigurationImportContext::XMLFootnoteConfigurationImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index e85d90e155ba..a3eeb5da0551 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/text/XFootnote.hpp> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::com::sun::star::lang; diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index 71620c156cfb..3e4344cc6765 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -38,8 +38,6 @@ #include <rtl/ustring.hxx> - - using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; @@ -60,7 +58,6 @@ const sal_Char sAPI_SortAlgorithm[] = "SortAlgorithm"; const sal_Char sAPI_Locale[] = "Locale"; - XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 7ea90a7066d4..19e15810f37c 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -44,7 +44,6 @@ const sal_Char sAPI_FieldMaster_Bibliography[] = "com.sun.star.text.FieldMaster.Bibliography"; - XMLIndexBibliographyConfigurationContext::XMLIndexBibliographyConfigurationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx index 301ec6185234..8cebc1329eb7 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -41,8 +41,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::xml::sax::XAttributeList; - - XMLIndexBibliographySourceContext::XMLIndexBibliographySourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx index f5752a21b03c..23529f632e4d 100644 --- a/xmloff/source/text/XMLIndexBodyContext.cxx +++ b/xmloff/source/text/XMLIndexBodyContext.cxx @@ -27,7 +27,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; - XMLIndexBodyContext::XMLIndexBodyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 9124d142df6c..a61ffaad93a7 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -45,8 +45,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::xml::sax::XAttributeList; - - XMLIndexChapterInfoEntryContext::XMLIndexChapterInfoEntryContext( SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx index 81d2a88d43a0..c3e8ea08dad5 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx @@ -38,7 +38,6 @@ using ::xmloff::token::XML_ILLUSTRATION_INDEX_ENTRY_TEMPLATE; using ::xmloff::token::XML_TOKEN_INVALID; - XMLIndexIllustrationSourceContext::XMLIndexIllustrationSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index 6e88b5066c5f..b4f0ad1d7ea9 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -37,7 +37,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; - XMLIndexMarkExport::XMLIndexMarkExport( SvXMLExport& rExp) : sLevel("Level") diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx index 5bd8eaf1dfc3..fba25b3e7353 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -53,7 +53,6 @@ const sal_Char sAPI_CreateFromStarMath[] = "CreateFromStarMath"; const sal_Char sAPI_CreateFromOtherEmbeddedObjects[] = "CreateFromOtherEmbeddedObjects"; - XMLIndexObjectSourceContext::XMLIndexObjectSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index 41c17c527afb..2d841e3d6747 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -33,7 +33,6 @@ #include <rtl/ustring.hxx> - using namespace ::xmloff::token; using ::com::sun::star::beans::XPropertySet; @@ -145,7 +144,6 @@ static const SvXMLTokenMapEntry aIndexSourceTokenMap[] = }; - XMLIndexSourceBaseContext::XMLIndexSourceBaseContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx index 19b35714450c..d3bfef932e83 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx @@ -28,7 +28,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::beans::PropertyValue; - XMLIndexSpanEntryContext::XMLIndexSpanEntryContext( SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index c51bf801ac5f..9ed5e223c363 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -58,7 +58,6 @@ using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::lang::IllegalArgumentException; - static const sal_Char* aIndexServiceMap[] = { "com.sun.star.text.ContentIndex", diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index 5c697ff2f0cb..59f8497f40b5 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -33,7 +33,6 @@ #include <rtl/ustring.hxx> - using namespace ::xmloff::token; using ::com::sun::star::beans::XPropertySet; @@ -47,7 +46,6 @@ const sal_Char sAPI_Level[] = "Level"; const sal_Char sAPI_CreateFromLevelParagraphStyles[] = "CreateFromLevelParagraphStyles"; - XMLIndexTOCSourceContext::XMLIndexTOCSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx index aabd907ab7f9..d218d9ad9c93 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx @@ -44,7 +44,6 @@ using ::com::sun::star::xml::sax::XAttributeList; const sal_Char sAPI_LevelParagraphStyles[] = "LevelParagraphStyles"; - XMLIndexTOCStylesContext::XMLIndexTOCStylesContext( SvXMLImport& rImport, Reference<XPropertySet> & rPropSet, sal_uInt16 nPrfx, const OUString& rLocalName) diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index c5ae4f36f3f3..614c4f07c0e3 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -42,7 +42,6 @@ using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::xml::sax::XAttributeList; - XMLIndexTabStopEntryContext::XMLIndexTabStopEntryContext( SvXMLImport& rImport, XMLIndexTemplateContext& rTemplate, diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 6e88ad50ad53..871a75589604 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -52,8 +52,6 @@ const sal_Char sAPI_LabelCategory[] = "LabelCategory"; const sal_Char sAPI_LabelDisplayType[] = "LabelDisplayType"; - - XMLIndexTableSourceContext::XMLIndexTableSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, Reference<XPropertySet> & rPropSet) diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 0e47d86ccc9b..cb5842b34738 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -60,7 +60,6 @@ const sal_Char sAPI_TokenBibliographyDataField[] = "TokenBibliographyDataField"; - XMLIndexTemplateContext::XMLIndexTemplateContext( SvXMLImport& rImport, Reference<XPropertySet> & rPropSet, @@ -220,7 +219,6 @@ void XMLIndexTemplateContext::EndElement() } - /// template token types; used for aTokenTypeMap parameter enum TemplateTokenType { @@ -329,12 +327,9 @@ SvXMLImportContext *XMLIndexTemplateContext::CreateChildContext( } - - // maps for the XMLIndexTemplateContext constructor - // table of content and user defined index: const SvXMLEnumMapEntry aSvLevelNameTOCMap[] = diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 31b7f690fccd..96912db54353 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -111,7 +111,6 @@ public: const OUString sLevelFormat; - XMLIndexTemplateContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index 4a7e2267d585..4557a84d5b5e 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -33,7 +33,6 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_STYLE_NAME; - XMLIndexTitleTemplateContext::XMLIndexTitleTemplateContext( SvXMLImport& rImport, Reference<XPropertySet> & rPropSet, diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index a08db5c5510e..a4a2d5cedac1 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -52,8 +52,6 @@ const sal_Char sAPI_CreateFromLevelParagraphStyles[] = "CreateFromLevelParagraph const sal_Char sAPI_UserIndexName[] = "UserIndexName"; - - XMLIndexUserSourceContext::XMLIndexUserSourceContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index 7bd89c31ed14..df911191b6a0 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -63,7 +63,6 @@ SvXMLEnumMapEntry const aLineNumberPositionMap[] = }; - void XMLLineNumberingExport::Export() { // export element if we have line numbering info diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 999c689b0ea8..d04edaa32e6a 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -42,7 +42,6 @@ using ::com::sun::star::xml::sax::XAttributeList; using ::com::sun::star::text::XLineNumberingProperties; - XMLLineNumberingImportContext::XMLLineNumberingImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 371d7b637cd0..5ac0a9636a11 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -55,7 +55,6 @@ #include "txtflde.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index 5a4d47bba2f7..0d1f87ec40fd 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -202,7 +202,6 @@ public: void ExportMasterDocHeadingDummies(); - protected: inline SvXMLExport& GetExport() { return rExport; } diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index 3dfc1c671549..8f3571220797 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -46,8 +46,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; - - XMLSectionFootnoteConfigImport::XMLSectionFootnoteConfigImport( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 181ba7055dab..7e9bbda0250e 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; - const sal_Char sAPI_TextSection[] = "com.sun.star.text.TextSection"; const sal_Char sAPI_IndexHeaderSection[] = "com.sun.star.text.IndexHeaderSection"; const sal_Char sAPI_IsProtected[] = "IsProtected"; diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx index 912be2b72ada..f65e922732f4 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -47,7 +47,6 @@ const sal_Char sAPI_DDECommandElement[] = "DDECommandElement"; const sal_Char sAPI_IsAutomaticUpdate[] = "IsAutomaticUpdate"; - XMLSectionSourceDDEImportContext::XMLSectionSourceDDEImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 8a6aefb5a98a..91ab4bf94448 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -39,7 +39,6 @@ using namespace ::com::sun::star::text; using namespace ::xmloff::token; - XMLSectionSourceImportContext::XMLSectionSourceImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx index bce6533a82d8..176ffaddf49d 100644 --- a/xmloff/source/text/XMLStringBufferImportContext.cxx +++ b/xmloff/source/text/XMLStringBufferImportContext.cxx @@ -28,7 +28,6 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_P; - XMLStringBufferImportContext::XMLStringBufferImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index a5bbb0510f51..a1423a75e1df 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -27,7 +27,6 @@ #include <xmloff/xmlimp.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; @@ -35,7 +34,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; - XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index c2cb21b9ab2f..bad3d03f0640 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -282,5 +282,4 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 63d349be8445..bbf27beccf89 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -41,7 +41,6 @@ #include "RDFaImportHelper.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; @@ -52,7 +51,6 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; - XMLFieldParamImportContext::XMLFieldParamImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -95,7 +93,6 @@ void XMLFieldParamImportContext::StartElement(const ::com::sun::star::uno::Refer } - XMLTextMarkImportContext::XMLTextMarkImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 4d09587f1aa6..267bf0eed1c4 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -31,7 +31,6 @@ #include "PageMasterImportContext.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index 5f49219339d9..a5ad798d7bc7 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -26,7 +26,6 @@ #include <xmloff/XMLTextMasterPageExport.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx index b51a91ca6fd1..5fcfd88bdfc5 100644 --- a/xmloff/source/text/XMLTextTableContext.cxx +++ b/xmloff/source/text/XMLTextTableContext.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; - XMLTextTableContext::XMLTextTableContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ) : diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx index 07677ad11b4d..a1428e130ffd 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -34,8 +34,6 @@ using ::com::sun::star::xml::sax::XAttributeList; using namespace ::xmloff::token; - - XMLTrackedChangesImportContext::XMLTrackedChangesImportContext( SvXMLImport& rImport, sal_uInt16 nPrefix, diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 21ffb5130719..9e69fae2894c 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -91,5 +91,4 @@ void XMLTextDropCapExport::exportXML( const Any& rAny, } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx index 0ea6bd3ad67b..b369528ffeed 100644 --- a/xmloff/source/text/txtdropi.hxx +++ b/xmloff/source/text/txtdropi.hxx @@ -23,7 +23,6 @@ #include "XMLElementPropertyContext.hxx" - class XMLTextDropCapImportContext :public XMLElementPropertyContext { XMLPropertyState aWholeWordProp; diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 1b41b6b4fd2c..8ed5bff5ccc5 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -247,7 +247,6 @@ SvXMLEnumStringMapEntry const aFieldServiceNameMapping[] = }; - // property accessor helper functions inline bool GetBoolProperty(const OUString&, const Reference<XPropertySet> &); @@ -272,7 +271,6 @@ inline Sequence<OUString> const GetStringSequenceProperty( const Reference<XPropertySet> & xPropSet); - XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp, XMLPropertyState* pCombinedCharState) : rExport(rExp), @@ -2426,7 +2424,6 @@ void XMLTextFieldExport::ProcessValueAndType( } - /// process display related properties void XMLTextFieldExport::ProcessDisplay(bool bIsVisible, bool bIsCommand, @@ -2451,7 +2448,6 @@ void XMLTextFieldExport::ProcessDisplay(bool bIsVisible, } - /// export boolean property void XMLTextFieldExport::ProcessBoolean(enum XMLTokenEnum eName, bool bBool, bool bDefault) @@ -2469,8 +2465,6 @@ void XMLTextFieldExport::ProcessBoolean(enum XMLTokenEnum eName, } - - /// export string attribute void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, const OUString& sValue, @@ -2595,7 +2589,6 @@ void XMLTextFieldExport::ProcessIntegerDef(enum XMLTokenEnum eName, } - /// export a numbering type void XMLTextFieldExport::ProcessNumberingType(sal_Int16 nNumberingType) { @@ -2739,7 +2732,6 @@ SvXMLEnumMapEntry const aBibliographyDataTypeMap[] = }; - void XMLTextFieldExport::ProcessBibliographyData( const Reference<XPropertySet>& rPropSet) { @@ -2882,7 +2874,6 @@ void XMLTextFieldExport::ExportDataBaseElement( } - // explode a field master name into field type and field name bool XMLTextFieldExport::ExplodeFieldMasterName( const OUString& sMasterName, OUString& sFieldType, OUString& sVarName) @@ -3536,7 +3527,6 @@ OUString XMLTextFieldExport::MakeSequenceRefName( // to be relegated (does that word exist?) to a more appropriate place - inline bool GetBoolProperty( const OUString& sPropName, const Reference<XPropertySet> & xPropSet) diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 002fee83985b..7836ce61f63d 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -67,7 +67,6 @@ #include <osl/diagnose.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -79,7 +78,6 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; - // SO API string constants @@ -193,7 +191,6 @@ const sal_Char sAPI_TextRange[] = "TextRange"; const sal_Char sAPI_true[] = "TRUE"; - XMLTextFieldImportContext::XMLTextFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, const sal_Char* pService, @@ -613,12 +610,9 @@ void XMLTextFieldImportContext::ForceUpdate( } - - // XMLSenderFieldImportContext - XMLSenderFieldImportContext::XMLSenderFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, @@ -739,12 +733,9 @@ void XMLSenderFieldImportContext::PrepareField( } - - // XMLAuthorFieldImportContext - XMLAuthorFieldImportContext::XMLAuthorFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, @@ -799,11 +790,9 @@ void XMLAuthorFieldImportContext::PrepareField( } - // page continuation string - static SvXMLEnumMapEntry const lcl_aSelectPageAttrMap[] = { { XML_PREVIOUS, PageNumberType_PREV }, @@ -864,12 +853,9 @@ void XMLPageContinuationImportContext::PrepareField( } - - // page number field - XMLPageNumberImportContext::XMLPageNumberImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) @@ -974,12 +960,9 @@ void XMLPageNumberImportContext::PrepareField( } - - // Placeholder - XMLPlaceholderFieldImportContext::XMLPlaceholderFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) @@ -1061,11 +1044,9 @@ void XMLPlaceholderFieldImportContext::PrepareField( } - // time field - XMLTimeFieldImportContext::XMLTimeFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) @@ -1204,12 +1185,9 @@ void XMLTimeFieldImportContext::PrepareField( } - - // date field - XMLDateFieldImportContext::XMLDateFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -1251,13 +1229,9 @@ void XMLDateFieldImportContext::ProcessAttribute( } - - - // database field superclass - XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, const sal_Char* pServiceName, sal_uInt16 nPrfx, @@ -1395,12 +1369,9 @@ void XMLDatabaseFieldImportContext::PrepareField( } - - // database name field - XMLDatabaseNameImportContext::XMLDatabaseNameImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -1418,12 +1389,9 @@ void XMLDatabaseNameImportContext::ProcessAttribute( } - - // database next field - XMLDatabaseNextImportContext::XMLDatabaseNextImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, const sal_Char* pServiceName, sal_uInt16 nPrfx, @@ -1484,12 +1452,9 @@ void XMLDatabaseNextImportContext::PrepareField( } - - // database select field - XMLDatabaseSelectImportContext::XMLDatabaseSelectImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -1535,12 +1500,9 @@ void XMLDatabaseSelectImportContext::PrepareField( } - - // database display row number field - XMLDatabaseNumberImportContext::XMLDatabaseNumberImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -1609,12 +1571,9 @@ void XMLDatabaseNumberImportContext::PrepareField( } - - // Simple doc info fields - XMLSimpleDocInfoImportContext::XMLSimpleDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken, @@ -1753,11 +1712,9 @@ const sal_Char* XMLSimpleDocInfoImportContext::MapTokenToServiceName( } - // revision field - XMLRevisionDocInfoImportContext::XMLRevisionDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) : @@ -1796,12 +1753,9 @@ void XMLRevisionDocInfoImportContext::PrepareField( } - - // DocInfo fields with date/time attributes - XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) @@ -1905,11 +1859,9 @@ void XMLDateTimeDocInfoImportContext::PrepareField( } - // user defined docinfo fields - XMLUserDocInfoImportContext::XMLUserDocInfoImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) : @@ -1992,11 +1944,9 @@ void XMLUserDocInfoImportContext::PrepareField( } - // import hidden paragraph fields - XMLHiddenParagraphImportContext::XMLHiddenParagraphImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -2048,12 +1998,9 @@ void XMLHiddenParagraphImportContext::PrepareField( } - - // import conditional text (<text:conditional-text>) - XMLConditionalTextImportContext::XMLConditionalTextImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -2135,12 +2082,9 @@ void XMLConditionalTextImportContext::PrepareField( } - - // hidden text - XMLHiddenTextImportContext::XMLHiddenTextImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -2209,12 +2153,9 @@ void XMLHiddenTextImportContext::PrepareField( } - - // file name fields - static const SvXMLEnumMapEntry aFilenameDisplayMap[] = { { XML_PATH, FilenameDisplayFormat::PATH }, @@ -2299,7 +2240,6 @@ void XMLFileNameImportContext::PrepareField( } - // template name field @@ -2358,11 +2298,9 @@ void XMLTemplateNameImportContext::PrepareField( } - // import chapter fields - static const SvXMLEnumMapEntry aChapterDisplayMap[] = { { XML_NAME, ChapterFormat::NAME }, @@ -2436,11 +2374,9 @@ void XMLChapterImportContext::PrepareField( } - // counting fields - XMLCountFieldImportContext::XMLCountFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName, sal_uInt16 nToken) : @@ -2535,12 +2471,9 @@ const sal_Char* XMLCountFieldImportContext::MapTokenToServiceName( } - - // page variable import - XMLPageVarGetFieldImportContext::XMLPageVarGetFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -2595,12 +2528,9 @@ void XMLPageVarGetFieldImportContext::PrepareField( } - - // page variable set fields - XMLPageVarSetFieldImportContext::XMLPageVarSetFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -2656,12 +2586,9 @@ void XMLPageVarSetFieldImportContext::PrepareField( } - - // macro fields - XMLMacroFieldImportContext::XMLMacroFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -2795,12 +2722,9 @@ void XMLMacroFieldImportContext::PrepareField( } - - // reference field import - XMLReferenceFieldImportContext::XMLReferenceFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nToken, sal_uInt16 nPrfx, const OUString& sLocalName) @@ -2934,8 +2858,6 @@ void XMLReferenceFieldImportContext::PrepareField( } - - // field declarations container @@ -2986,12 +2908,9 @@ SvXMLImportContext * XMLDdeFieldDeclsImportContext::CreateChildContext( } - - // import dde field declaration - XMLDdeFieldDeclImportContext::XMLDdeFieldDeclImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& sLocalName, const SvXMLTokenMap& rMap) @@ -3126,12 +3045,9 @@ void XMLDdeFieldDeclImportContext::StartElement( } - - // DDE field import - XMLDdeFieldImportContext::XMLDdeFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -3210,11 +3126,9 @@ void XMLDdeFieldImportContext::PrepareField( } - // sheet name fields - XMLSheetNameImportContext::XMLSheetNameImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -3268,7 +3182,6 @@ void XMLPageNameFieldImportContext::PrepareField( // URL fields (Calc, Impress, Draw) - XMLUrlFieldImportContext::XMLUrlFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -3323,8 +3236,6 @@ void XMLUrlFieldImportContext::PrepareField( } - - XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -3583,11 +3494,9 @@ const sal_Char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( } - // Annotation Field - XMLAnnotationImportContext::XMLAnnotationImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -3809,12 +3718,9 @@ void XMLAnnotationImportContext::PrepareField( } - - // script field - XMLScriptImportContext::XMLScriptImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -3879,7 +3785,6 @@ void XMLScriptImportContext::PrepareField( // measure field - XMLMeasureFieldImportContext::XMLMeasureFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -3923,13 +3828,9 @@ void XMLMeasureFieldImportContext::PrepareField( } - - // dropdown field - - XMLDropDownFieldImportContext::XMLDropDownFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index 63ad69470b9e..f990e2f33150 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -18,7 +18,6 @@ */ - /** @#file * * This file implements XMLTextParagraphExport methods to export @@ -284,7 +283,6 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper( XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, false, true); - Any aAny; // numbering style diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index f3f6c4e24e32..f9840390340e 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -211,7 +211,6 @@ OUString XMLTextListsHelper::GetContinueListIdOfProcessedList( } - OUString XMLTextListsHelper::GenerateNewListId() const { static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != nullptr); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 97317ab595a8..001f3e2701ce 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3149,7 +3149,6 @@ void XMLTextParagraphExport::_exportTextGraphic( } - // script:events Reference<XEventsSupplier> xEventsSupp( rPropSet, UNO_QUERY ); GetExport().GetEventExport().Export(xEventsSupp); diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 3a6900b9fc76..80f565db7b04 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -83,7 +83,6 @@ static const sal_Char sAPI_sequence_value[] = "SequenceValue"; static const sal_Char sAPI_is_fixed_language[] = "IsFixedLanguage"; - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -92,12 +91,9 @@ using namespace ::com::sun::star::style; using namespace ::xmloff::token; - - // XMLVarFieldImportContext: superclass for all variable related fields - XMLVarFieldImportContext::XMLVarFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, const sal_Char* pServiceName, sal_uInt16 nPrfx, @@ -283,14 +279,9 @@ void XMLVarFieldImportContext::PrepareField( } - - - - // variable set fields - XMLSetVarFieldImportContext::XMLSetVarFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, const sal_Char* pServiceName, sal_uInt16 nPrfx, @@ -372,12 +363,9 @@ bool XMLSetVarFieldImportContext::FindFieldMaster( } - - // sequence field - XMLSequenceFieldImportContext::XMLSequenceFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName) : @@ -444,12 +432,9 @@ void XMLSequenceFieldImportContext::PrepareField( } - - // variable set field - XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName) : @@ -479,12 +464,9 @@ void XMLVariableSetFieldImportContext::PrepareField( } - - // variable input field - XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName) : @@ -520,12 +502,9 @@ void XMLVariableInputFieldImportContext::PrepareField( } - - // user field - XMLUserFieldImportContext::XMLUserFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName) : @@ -541,12 +520,9 @@ XMLUserFieldImportContext::XMLUserFieldImportContext( } - - // user input field - // bug: doesn't work (SO API lacking) XMLUserFieldInputImportContext::XMLUserFieldInputImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, @@ -574,11 +550,9 @@ void XMLUserFieldInputImportContext::PrepareField( } - // variable get field - XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName) : @@ -606,12 +580,9 @@ void XMLVariableGetFieldImportContext::PrepareField( } - - // expression field - XMLExpressionFieldImportContext::XMLExpressionFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName) : @@ -642,12 +613,9 @@ void XMLExpressionFieldImportContext::PrepareField( } - - // text input field - XMLTextInputFieldImportContext::XMLTextInputFieldImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& sLocalName) : @@ -675,11 +643,9 @@ void XMLTextInputFieldImportContext::PrepareField( } - // table formula field - XMLTableFormulaImportContext::XMLTableFormulaImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -740,20 +706,14 @@ void XMLTableFormulaImportContext::PrepareField( } - - // variable declarations // Should be adapted to XMLVarField-/XMLSetVarFieldImportContext scheme! - - - // declaration containter import (<variable/user-field/sequence-decls>) - XMLVariableDeclsImportContext::XMLVariableDeclsImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName, enum VarType eVarType) : @@ -808,12 +768,9 @@ SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext( } - - // declaration import (<variable/user-field/sequence-decl> elements) - XMLVariableDeclImportContext::XMLVariableDeclImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -924,7 +881,6 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext( } - bool XMLVariableDeclImportContext::FindFieldMaster( Reference<XPropertySet> & xMaster, SvXMLImport& rImport, XMLTextImportHelper& rImportHelper, @@ -1060,12 +1016,9 @@ bool XMLVariableDeclImportContext::FindFieldMaster( } - // Database Display field import - - XMLDatabaseDisplayImportContext::XMLDatabaseDisplayImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, sal_uInt16 nPrfx, const OUString& rLocalName) : @@ -1192,7 +1145,6 @@ void XMLDatabaseDisplayImportContext::EndElement() } - // value import helper diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index 95dc0763a234..6ec0aa3a264e 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -184,7 +184,6 @@ void XMLAxisOASISContext::EndElement() } - XMLChartPlotAreaOASISTContext::XMLChartPlotAreaOASISTContext( XMLTransformerBase & rTransformer, const OUString & rQName ) : XMLProcAttrTransformerContext( rTransformer, rQName, OASIS_SHAPE_ACTIONS ) diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index 5df97537a1aa..d3a4f1e414e2 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -116,7 +116,6 @@ void XMLAxisOOoContext::StartElement( } - XMLChartPlotAreaOOoTContext::XMLChartPlotAreaOOoTContext( XMLTransformerBase & rTransformer, const OUString & rQName ) : XMLProcAttrTransformerContext( rTransformer, rQName, OOO_SHAPE_ACTIONS ) diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx index 6adde3b6429a..21d6e05b5fb4 100644 --- a/xmloff/source/transform/PropertyActionsOOo.cxx +++ b/xmloff/source/transform/PropertyActionsOOo.cxx @@ -649,7 +649,6 @@ XMLTransformerActionInit aTextPropertyOOoElemActionTable[] = }; - XMLTransformerActionInit aParagraphPropertyOOoAttrActionTable[] = { { XML_NAMESPACE_FO, XML_LINE_HEIGHT, XML_ATACTION_INCH2IN, diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 63c8b2b207ad..28d5c9ed40c3 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -1424,7 +1424,6 @@ XMLTokenEnum XMLTransformerBase::GetToken( const OUString& rStr ) const } - const XMLTransformerContext *XMLTransformerBase::GetCurrentContext() const { OSL_ENSURE( !m_pContexts->empty(), "empty stack" ); diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx index 0d827e56db2a..1a9b0f6b4212 100644 --- a/xmloff/source/xforms/SchemaContext.cxx +++ b/xmloff/source/xforms/SchemaContext.cxx @@ -39,8 +39,6 @@ using com::sun::star::xforms::XDataTypeRepository; using namespace xmloff::token; - - static const SvXMLTokenMapEntry aAttributes[] = { XML_TOKEN_MAP_END diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index b7ab05eee0e5..12387c26a459 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -57,8 +57,6 @@ using com::sun::star::xforms::XDataTypeRepository; using namespace xmloff::token; - - static const SvXMLTokenMapEntry aAttributes[] = { TOKEN_MAP_ENTRY( NONE, BASE ), diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index 671ef25c9d78..77c5bc80a26b 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -40,8 +40,6 @@ using com::sun::star::xforms::XDataTypeRepository; using namespace xmloff::token; - - static const SvXMLTokenMapEntry aAttributes[] = { TOKEN_MAP_ENTRY( NONE, NAME ), diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index 0e43c1db9e88..b766414fcbaa 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -46,8 +46,6 @@ using com::sun::star::xforms::XModel2; using namespace xmloff::token; - - static const struct SvXMLTokenMapEntry aAttributeMap[] = { TOKEN_MAP_ENTRY( NONE, NODESET ), diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index ecede75093f4..4764f00cae98 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -47,8 +47,6 @@ using namespace com::sun::star::uno; using namespace xmloff::token; - - static const SvXMLTokenMapEntry aAttributes[] = { TOKEN_MAP_ENTRY( NONE, ID ), @@ -79,8 +77,6 @@ XFormsModelContext::~XFormsModelContext() } - - void XFormsModelContext::HandleAttribute( sal_uInt16 nToken, const OUString& rValue ) diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index c7bc2154905a..bd71f60423c2 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -46,8 +46,6 @@ using namespace com::sun::star::uno; using namespace xmloff::token; - - static const struct SvXMLTokenMapEntry aAttributeMap[] = { TOKEN_MAP_ENTRY( NONE, ID ), diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index af419af8364b..28b1dbfe64b6 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -147,7 +147,6 @@ static OUString lcl_getXSDType( SvXMLExport& rExport, const Reference<XPropertySet>& xType ); - // the model @@ -249,7 +248,6 @@ void exportXFormsInstance( SvXMLExport& rExport, } - // the binding @@ -363,7 +361,6 @@ void exportXFormsBinding( SvXMLExport& rExport, } - // the submission @@ -396,8 +393,6 @@ void exportXFormsSubmission( SvXMLExport& rExport, } - - // export data types as XSD schema @@ -594,8 +589,6 @@ void exportXFormsSchemas( SvXMLExport& rExport, } - - // helper functions @@ -620,8 +613,6 @@ static void lcl_export( const Reference<XPropertySet>& rPropertySet, } - - // any conversion functions diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx index 1ad2e41e6257..d0b90a800280 100644 --- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx @@ -74,7 +74,6 @@ struct XMLSignatureVerifyResult }; - /********************************************************** XMLSignatureHelper diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 2b5544f86489..674979b68c82 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -67,7 +67,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL xmlsecurity_component_getFactory( const sal_ } // extern "C" - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx index 8aba8cc0ef9f..ccdcb723bc26 100644 --- a/xmlsecurity/source/framework/elementcollector.cxx +++ b/xmlsecurity/source/framework/elementcollector.cxx @@ -74,7 +74,6 @@ ElementCollector::ElementCollector( } - void ElementCollector::notifyListener() /****** ElementCollector/notifyListener *************************************** * diff --git a/xmlsecurity/source/framework/elementmark.cxx b/xmlsecurity/source/framework/elementmark.cxx index c5a4aeba913d..2ce86f8a1b60 100644 --- a/xmlsecurity/source/framework/elementmark.cxx +++ b/xmlsecurity/source/framework/elementmark.cxx @@ -64,7 +64,4 @@ void ElementMark::setSecurityId(sal_Int32 nSecurityId) } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx index 724501c84a08..d8f4399e31c7 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx @@ -343,5 +343,4 @@ SAL_CALL SAXEventKeeperImpl_createInstance( const com::sun::star::uno::Reference #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx index b59428917b10..3915f483e07a 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx @@ -116,5 +116,4 @@ SAL_CALL SignatureCreatorImpl_createInstance( #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 6358acafa607..b0097368d560 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -52,7 +52,6 @@ OUString getElement(OUString const & version, ::sal_Int32 * index) } - // Return 1 if version1 is greater then version 2, 0 if they are equal //and -1 if version1 is less version 2 int compareVersions( diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx b/xmlsecurity/source/xmlsec/nss/secerror.cxx index 24955bb2ccf3..4448599c10eb 100644 --- a/xmlsecurity/source/xmlsec/nss/secerror.cxx +++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx @@ -34,7 +34,6 @@ struct ErrDesc { }; - const ErrDesc allDesc[] = { #include "certerrors.h" @@ -42,7 +41,6 @@ const ErrDesc allDesc[] = { }; - /* Returns a UTF-8 encoded constant error string for "errNum". * Returns NULL of errNum is unknown. */ diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 8d367b782edc..32be4fd5af6e 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -77,7 +77,6 @@ struct UsageDescription }; - char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ ) { uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 4bd7854998b9..f347d7f464eb 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -274,7 +274,6 @@ SAL_CALL XMLSignature_NssImpl::validate( } - //Unregistered the stream/URI binding if( xUriBinding.is() ) xmlUnregisterStreamInputCallbacks() ; |