1 files changed, 68 insertions, 0 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1052b7b89e9c..b9015ddb4c58 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -88,6 +88,8 @@ using ::com::sun::star::beans::XPropertySet;
 
 namespace sd {
 
+namespace {
+
 class PresetPropertyBox  : public PropertySubControl
 {
 public:
@@ -105,6 +107,8 @@ private:
     Link<LinkParamNone*,void> const maModifyLink;
 };
 
+}
+
 PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl )
 : PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
 {
@@ -174,6 +178,8 @@ SdPropertySubControl::~SdPropertySubControl()
 {
 }
 
+namespace {
+
 class SdPresetPropertyBox  : public SdPropertySubControl
 {
 public:
@@ -190,6 +196,8 @@ private:
     DECL_LINK(OnSelect, weld::ComboBox&, void);
 };
 
+}
+
 SdPresetPropertyBox::SdPresetPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const OUString& aPresetId, const Link<LinkParamNone*,void>& rModifyHdl)
     : SdPropertySubControl(pParent)
     , maModifyLink(rModifyHdl)
@@ -253,6 +261,8 @@ Any SdPresetPropertyBox::getValue()
     return makeAny(maPropertyValues[nIndex]);
 }
 
+namespace {
+
 class ColorPropertyBox  : public PropertySubControl
 {
 public:
@@ -269,6 +279,8 @@ private:
     Link<LinkParamNone*,void> const maModifyLink;
 };
 
+}
+
 ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
 : PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
 {
@@ -314,6 +326,8 @@ Control* ColorPropertyBox::getControl()
     return mpControl;
 }
 
+namespace {
+
 class SdColorPropertyBox  : public SdPropertySubControl
 {
 public:
@@ -329,6 +343,8 @@ private:
     DECL_LINK(OnSelect, ColorListBox&, void);
 };
 
+}
+
 SdColorPropertyBox::SdColorPropertyBox(weld::Label* pLabel, weld::Container* pParent, weld::Window* pTopLevel, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : SdPropertySubControl(pParent)
     , maModifyLink(rModifyHdl)
@@ -366,6 +382,8 @@ Any SdColorPropertyBox::getValue()
     return makeAny(sal_Int32(mxControl->GetSelectEntryColor().GetRGBColor()));
 }
 
+namespace {
+
 class FontPropertyBox : public PropertySubControl
 {
 public:
@@ -383,6 +401,8 @@ private:
     DECL_LINK(ControlSelectHdl, ComboBox&, void);
 };
 
+}
+
 FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
 : PropertySubControl( nControlType ), maModifyHdl(rModifyHdl)
 {
@@ -446,6 +466,8 @@ Control* FontPropertyBox::getControl()
     return mpControl;
 }
 
+namespace {
+
 class SdFontPropertyBox : public SdPropertySubControl
 {
 public:
@@ -461,6 +483,8 @@ private:
     DECL_LINK(ControlSelectHdl, weld::ComboBox&, void);
 };
 
+}
+
 SdFontPropertyBox::SdFontPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : SdPropertySubControl(pParent)
     , maModifyHdl(rModifyHdl)
@@ -524,6 +548,8 @@ Any SdFontPropertyBox::getValue()
     return makeAny(aFontName);
 }
 
+namespace {
+
 class DropdownMenuBox : public Edit
 {
 public:
@@ -542,6 +568,8 @@ private:
     VclPtr<PopupMenu>   mpMenu;
 };
 
+}
+
 DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, PopupMenu* pMenu )
 :   Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ),
     mpSubControl(pSubControl),mpDropdownButton(nullptr),mpMenu(pMenu)
@@ -606,6 +634,8 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
     return bResult;
 }
 
+namespace {
+
 class CharHeightPropertyBox : public PropertySubControl
 {
 public:
@@ -628,6 +658,8 @@ private:
     Link<LinkParamNone*,void> const maModifyHdl;
 };
 
+}
+
 CharHeightPropertyBox::CharHeightPropertyBox(sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : PropertySubControl(nControlType)
     , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/simpress/ui/fontsizemenu.ui", "")
@@ -685,6 +717,8 @@ Control* CharHeightPropertyBox::getControl()
     return mpControl;
 }
 
+namespace {
+
 class SdCharHeightPropertyBox : public SdPropertySubControl
 {
 public:
@@ -703,6 +737,8 @@ private:
     DECL_LINK(EditModifyHdl, weld::MetricSpinButton&, void);
 };
 
+}
+
 SdCharHeightPropertyBox::SdCharHeightPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : SdPropertySubControl(pParent)
     , maModifyHdl(rModifyHdl)
@@ -748,6 +784,8 @@ Any SdCharHeightPropertyBox::getValue()
     return makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) / 100.0);
 }
 
+namespace {
+
 class TransparencyPropertyBox : public PropertySubControl
 {
 public:
@@ -771,6 +809,8 @@ private:
     Link<LinkParamNone*,void> const maModifyHdl;
 };
 
+}
+
 TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
 : PropertySubControl( nControlType )
 , maModifyHdl( rModifyHdl )
@@ -847,6 +887,8 @@ Control* TransparencyPropertyBox::getControl()
     return mpControl;
 }
 
+namespace {
+
 class SdTransparencyPropertyBox : public SdPropertySubControl
 {
 public:
@@ -867,6 +909,8 @@ private:
     std::unique_ptr<weld::MenuButton> mxControl;
 };
 
+}
+
 SdTransparencyPropertyBox::SdTransparencyPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : SdPropertySubControl(pParent)
     , maModifyHdl(rModifyHdl)
@@ -932,6 +976,8 @@ Any SdTransparencyPropertyBox::getValue()
     return makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) / 100.0);
 }
 
+namespace {
+
 class RotationPropertyBox : public PropertySubControl
 {
 public:
@@ -956,6 +1002,8 @@ private:
     Link<LinkParamNone*,void> const maModifyHdl;
 };
 
+}
+
 RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
     : PropertySubControl(nControlType)
     , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/simpress/ui/rotatemenu.ui", "")
@@ -1051,6 +1099,8 @@ Control* RotationPropertyBox::getControl()
     return mpControl;
 }
 
+namespace {
+
 class SdRotationPropertyBox : public SdPropertySubControl
 {
 public:
@@ -1071,6 +1121,8 @@ private:
     std::unique_ptr<weld::MenuButton> mxControl;
 };
 
+}
+
 SdRotationPropertyBox::SdRotationPropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : SdPropertySubControl(pParent)
     , maModifyHdl(rModifyHdl)
@@ -1150,6 +1202,8 @@ Any SdRotationPropertyBox::getValue()
     return makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::DEGREE)));
 }
 
+namespace {
+
 class ScalePropertyBox : public PropertySubControl
 {
 public:
@@ -1175,6 +1229,8 @@ private:
     int                       mnDirection;
 };
 
+}
+
 ScalePropertyBox::ScalePropertyBox(sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : PropertySubControl( nControlType )
     , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/simpress/ui/scalemenu.ui", "")
@@ -1328,6 +1384,8 @@ Control* ScalePropertyBox::getControl()
     return mpControl;
 }
 
+namespace {
+
 class SdScalePropertyBox : public SdPropertySubControl
 {
 public:
@@ -1349,6 +1407,8 @@ private:
     std::unique_ptr<weld::MenuButton> mxControl;
 };
 
+}
+
 SdScalePropertyBox::SdScalePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl)
     : SdPropertySubControl(pParent)
     , maModifyHdl( rModifyHdl )
@@ -1487,6 +1547,8 @@ Any SdScalePropertyBox::getValue()
     return makeAny( aValues );
 }
 
+namespace {
+
 class FontStylePropertyBox : public PropertySubControl
 {
 public:
@@ -1514,6 +1576,8 @@ private:
     sal_Int16 mnFontUnderline;
 };
 
+}
+
 FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
     : PropertySubControl(nControlType)
     , maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/simpress/ui/fontstylemenu.ui", "")
@@ -1607,6 +1671,8 @@ Control* FontStylePropertyBox::getControl()
     return mpControl;
 }
 
+namespace {
+
 class SdFontStylePropertyBox : public SdPropertySubControl
 {
 public:
@@ -1629,6 +1695,8 @@ private:
     std::unique_ptr<weld::MenuButton> mxControl;
 };
 
+}
+
 SdFontStylePropertyBox::SdFontStylePropertyBox(weld::Label* pLabel, weld::Container* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
     : SdPropertySubControl(pParent)
     , maModifyHdl( rModifyHdl )