summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2010-11-18 11:30:02 +0000
committerNoel Power <noel.power@novell.com>2010-11-18 11:30:02 +0000
commitb3b7d3a24ea1008e6c41f47020d3f171810d6cbe (patch)
treecfc89c20237275b6d1f209e21811c56fbddf0a0f
parent68e8d914d8c5eeff22dd71fac3c96ba20df0e698 (diff)
altrnative fix for n#654039 empty toolbar
-rw-r--r--patches/dev300/writer-navigation-buttons.diff50
1 files changed, 3 insertions, 47 deletions
diff --git a/patches/dev300/writer-navigation-buttons.diff b/patches/dev300/writer-navigation-buttons.diff
index 24916c64a..c0e9f6630 100644
--- a/patches/dev300/writer-navigation-buttons.diff
+++ b/patches/dev300/writer-navigation-buttons.diff
@@ -545,15 +545,14 @@ diff --git sw/source/ui/inc/shells.hrc sw/source/ui/inc/shells.hrc
index 243c4fc..847d322 100644
--- sw/source/ui/inc/shells.hrc
+++ sw/source/ui/inc/shells.hrc
-@@ -102,7 +102,10 @@
+@@ -102,7 +102,9 @@
#define RID_MEDIA_TOOLBOX (RC_SHELLS_BEGIN + 61)
-#define SHELLS_ACT_END RID_MEDIA_TOOLBOX
+#define STR_SHELLNAME_NAVIGATION (RC_SHELLS_BEGIN + 62)
-+#define RID_NAVIGATION_TOOLBOX (RC_SHELLS_BEGIN + 63)
+
-+#define SHELLS_ACT_END RID_NAVIGATION_TOOLBOX
++#define SHELLS_ACT_END STR_SHELLNAME_NAVIGATION
#if SHELLS_ACT_END > RC_SHELLS_END
#error Resource-Id Ueberlauf in #file, #line
@@ -638,7 +637,7 @@ new file mode 100644
index 0000000..9f3a1ca
--- /dev/null
+++ sw/source/ui/shells/navsh.cxx
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,168 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -712,7 +711,6 @@ index 0000000..9f3a1ca
+
+SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell, SW_RES(STR_SHELLNAME_NAVIGATION))
+{
-+ SFX_OBJECTBAR_REGISTRATION(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NAVIGATION_TOOLBOX));
+}
+
+SwNavigationShell::SwNavigationShell(SwView &_rView):
@@ -808,48 +806,6 @@ index 0000000..9f3a1ca
+ nWhich = aIter.NextWhich();
+ }
+}
-diff --git sw/source/ui/shells/shells.src sw/source/ui/shells/shells.src
-index 42b3b00..d9e783d 100644
---- sw/source/ui/shells/shells.src
-+++ sw/source/ui/shells/shells.src
-@@ -1030,6 +1030,37 @@ ToolBox RID_NUM_TOOLBOX
- };
- Scroll = TRUE ;
- };
-+
-+
-+ToolBox RID_NAVIGATION_TOOLBOX
-+{
-+ HelpID = HID_NAVIGATION_TOOLBOX ;
-+ Border = TRUE ;
-+ SVLook = TRUE ;
-+ Dockable = TRUE ;
-+ Moveable = TRUE ;
-+ Sizeable = TRUE ;
-+ Closeable = TRUE ;
-+ Zoomable = TRUE ;
-+ LineSpacing = TRUE ;
-+ Customize = TRUE ;
-+ MenuStrings = TRUE ;
-+ Scroll = TRUE ;
-+ ItemList =
-+ {
-+ ToolBoxItem
-+ {
-+ Identifier = FN_NAVIGATION_BACK ;
-+ HelpID = FN_NAVIGATION_BACK ;
-+ };
-+ ToolBoxItem
-+ {
-+ Identifier = FN_NAVIGATION_FORWARD ;
-+ HelpID = FN_NAVIGATION_FORWARD ;
-+ };
-+ };
-+};
-+
- String STR_SHELLNAME_TEXT
- {
- Text [ en-US ] = "Text" ;
diff --git sw/source/ui/shells/textsh1.cxx sw/source/ui/shells/textsh1.cxx
index f41d28c..760e4d7 100644
--- sw/source/ui/shells/textsh1.cxx