7 files changed, 10 insertions, 251 deletions
diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc
deleted file mode 100644
index 5f47546f238c..000000000000
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC
-#define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC
-
-#include "glob.hrc"
-
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// attention, we have 200 ids free after RID_CUSTOMANIMATION_START
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-#define STR_CUSTOMANIMATION_REPEAT_NONE                 RID_CUSTOMANIMATION_START+5
-#define STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK     RID_CUSTOMANIMATION_START+6
-#define STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE   RID_CUSTOMANIMATION_START+7
-#define STR_CUSTOMANIMATION_DIRECTION_PROPERTY          RID_CUSTOMANIMATION_START+8
-#define STR_CUSTOMANIMATION_ZOOM_PROPERTY               RID_CUSTOMANIMATION_START+9
-#define STR_CUSTOMANIMATION_SPOKES_PROPERTY             RID_CUSTOMANIMATION_START+10
-#define STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY        RID_CUSTOMANIMATION_START+11
-#define STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY       RID_CUSTOMANIMATION_START+12
-#define STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY         RID_CUSTOMANIMATION_START+13
-#define STR_CUSTOMANIMATION_STYLE_PROPERTY              RID_CUSTOMANIMATION_START+14
-#define STR_CUSTOMANIMATION_FONT_PROPERTY               RID_CUSTOMANIMATION_START+15
-#define STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY         RID_CUSTOMANIMATION_START+16
-#define STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY    RID_CUSTOMANIMATION_START+17
-#define STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY         RID_CUSTOMANIMATION_START+18
-#define STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY         RID_CUSTOMANIMATION_START+19
-#define STR_CUSTOMANIMATION_SIZE_PROPERTY               RID_CUSTOMANIMATION_START+20
-#define STR_CUSTOMANIMATION_AMOUNT_PROPERTY             RID_CUSTOMANIMATION_START+21
-#define STR_CUSTOMANIMATION_COLOR_PROPERTY              RID_CUSTOMANIMATION_START+22
-#define STR_CUSTOMANIMATION_NO_SOUND                    RID_CUSTOMANIMATION_START+23
-#define STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND         RID_CUSTOMANIMATION_START+24
-#define STR_CUSTOMANIMATION_SCALE_PROPERTY              RID_CUSTOMANIMATION_START+25
-#define STR_CUSTOMANIMATION_SAMPLE                      RID_CUSTOMANIMATION_START+26
-#define STR_CUSTOMANIMATION_BROWSE_SOUND                RID_CUSTOMANIMATION_START+27
-#define STR_CUSTOMANIMATION_TRIGGER                     RID_CUSTOMANIMATION_START+35
-#define STR_CUSTOMANIMATION_LIST_HELPTEXT               RID_CUSTOMANIMATION_START+36
-#define STR_CUSTOMANIMATION_USERPATH                    RID_CUSTOMANIMATION_START+37
-#define STR_SLIDETRANSITION_NONE                        RID_CUSTOMANIMATION_START+38
-#define STR_CUSTOMANIMATION_ENTRANCE                    RID_CUSTOMANIMATION_START+39
-#define STR_CUSTOMANIMATION_EMPHASIS                    RID_CUSTOMANIMATION_START+40
-#define STR_CUSTOMANIMATION_EXIT                        RID_CUSTOMANIMATION_START+41
-#define STR_CUSTOMANIMATION_MOTION_PATHS                RID_CUSTOMANIMATION_START+42
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
deleted file mode 100644
index e18c16da87cc..000000000000
--- a/sd/source/ui/animations/CustomAnimation.src
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "CustomAnimation.hrc"
-
-String STR_CUSTOMANIMATION_REPEAT_NONE
-{
-    Text [ en-US ] = "none";
-};
-
-String STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK
-{
-    Text [ en-US ] = "Until next click";
-};
-
-String STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE
-{
-    Text [ en-US ] = "Until end of slide";
-};
-
-String STR_CUSTOMANIMATION_DIRECTION_PROPERTY
-{
-    Text [ en-US ] = "Direction:";
-};
-
-String STR_CUSTOMANIMATION_ZOOM_PROPERTY
-{
-    Text [ en-US ] = "Zoom:";
-};
-
-String STR_CUSTOMANIMATION_SPOKES_PROPERTY
-{
-    Text [ en-US ] = "Spokes:";
-};
-
-String STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY
-{
-    Text [ en-US ] = "First color:";
-};
-
-String STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Second color:";
-};
-
-String STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Fill color:";
-};
-
-String STR_CUSTOMANIMATION_STYLE_PROPERTY
-{
-    Text [ en-US ] = "Style:";
-};
-
-String STR_CUSTOMANIMATION_FONT_PROPERTY
-{
-    Text [ en-US ] = "Font:";
-};
-
-String STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Font color:";
-};
-
-String STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY
-{
-    Text [ en-US ] = "Style:";
-};
-
-String STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY
-{
-    Text [ en-US ] = "Typeface:";
-};
-
-String STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Line color:";
-};
-
-String STR_CUSTOMANIMATION_SIZE_PROPERTY
-{
-    Text [ en-US ] = "Font size:";
-};
-
-String STR_CUSTOMANIMATION_SCALE_PROPERTY
-{
-    Text [ en-US ] = "Size:";
-};
-
-String STR_CUSTOMANIMATION_AMOUNT_PROPERTY
-{
-    Text [ en-US ] = "Amount:";
-};
-
-String STR_CUSTOMANIMATION_COLOR_PROPERTY
-{
-    Text [ en-US ] = "Color:";
-};
-
-String STR_CUSTOMANIMATION_NO_SOUND
-{
-    Text [ en-US ] = "(No sound)";
-};
-
-String STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND
-{
-    Text [ en-US ] = "(Stop previous sound)";
-};
-
-String STR_CUSTOMANIMATION_BROWSE_SOUND
-{
-    Text [ en-US ] = "Other sound...";
-};
-
-String STR_CUSTOMANIMATION_SAMPLE
-{
-    Text [ en-US ] = "Sample";
-};
-
-String STR_CUSTOMANIMATION_TRIGGER
-{
-    Text [ en-US ] = "Trigger";
-};
-
-String STR_CUSTOMANIMATION_LIST_HELPTEXT
-{
-    Text [ en-US ] = "First select the slide element and then click 'Add...' to add an animation effect.";
-};
-
-String STR_CUSTOMANIMATION_USERPATH
-{
-    Text [ en-US ] = "User paths";
-};
-
-String STR_CUSTOMANIMATION_ENTRANCE
-{
-    Text [ en-US ] = "Entrance: %1";
-};
-
-String STR_CUSTOMANIMATION_EMPHASIS
-{
-    Text [ en-US ] = "Emphasis: %1";
-};
-
-String STR_CUSTOMANIMATION_EXIT
-{
-    Text [ en-US ] = "Exit: %1";
-};
-
-String STR_CUSTOMANIMATION_MOTION_PATHS
-{
-    Text [ en-US ] = "Motion Paths: %1";
-};
-
-String STR_SLIDETRANSITION_NONE
-{
-    Text [ en-US ] = "None";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 474d3c6e0860..21b28406cfed 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -68,10 +68,9 @@
 #include <svx/dialogs.hrc>
 #include "sdresid.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "CustomAnimationDialog.hxx"
 #include "CustomAnimationPane.hxx"
-#include "CustomAnimation.hrc"
 #include "STLPropertySet.hxx"
 
 #include <avmedia/mediawindow.hxx>
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 32553c5a4ca7..e76705c38141 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include "CustomAnimationList.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 #include "CustomAnimationPreset.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -41,8 +41,8 @@
 #include "svtools/treelistentry.hxx"
 #include "svtools/viewdataentry.hxx"
 
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "bitmaps.hlst"
 
 #include <algorithm>
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index a029cd3e5b39..1e5839f16414 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -28,7 +28,7 @@
 #include <svtools/treelistbox.hxx>
 #include <CustomAnimationEffect.hxx>
 #include "CustomAnimationPreset.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 
 namespace sd {
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 6598d82377c6..62dea9da7497 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -41,7 +41,7 @@
 #include "STLPropertySet.hxx"
 #include "CustomAnimationPane.hxx"
 #include "CustomAnimationDialog.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 #include "CustomAnimationList.hxx"
 #include "createcustomanimationpanel.hxx"
 #include <vcl/lstbox.hxx>
@@ -72,13 +72,13 @@
 
 #include "EventMultiplexer.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
 #include "app.hrc"
 
 #include <svx/svdetc.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drange.hxx>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 2039d405659a..98ca27c8c279 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/animations/XAnimationNode.hpp>
 
 #include "SlideTransitionPane.hxx"
-#include "CustomAnimation.hrc"
+#include "strings.hrc"
 #include "createslidetransitionpanel.hxx"
 
 #include "TransitionPreset.hxx"
@@ -34,7 +34,7 @@
 #include "DrawController.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
 #include <svx/gallery.hxx>
 #include <unotools/pathoptions.hxx>
 #include <vcl/msgbox.hxx>