[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - cui/source officecfg/registry sc/inc sc/sdi sc/source sd/source sfx2/source svx/inc

Ariel Constenla-Haile arielch at apache.org
Thu Apr 25 18:58:52 PDT 2013


 cui/source/inc/cuires.hrc                                         |    3 
 officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu |   26 ++++----
 sc/inc/sc.hrc                                                     |    5 -
 sc/sdi/cellsh.sdi                                                 |    1 
 sc/sdi/scalc.sdi                                                  |   26 ++++++++
 sc/source/ui/view/cellsh3.cxx                                     |    4 +
 sd/source/ui/unoidl/DrawController.cxx                            |    1 
 sfx2/source/sidebar/Panel.cxx                                     |   17 ++++-
 sfx2/source/sidebar/Panel.hxx                                     |    7 +-
 sfx2/source/sidebar/PanelTitleBar.cxx                             |   32 ++++++----
 sfx2/source/sidebar/PanelTitleBar.hxx                             |    7 +-
 sfx2/source/sidebar/SidebarController.cxx                         |   16 ++---
 sfx2/source/sidebar/SidebarController.hxx                         |    3 
 svx/inc/svx/dialogs.hrc                                           |    2 
 14 files changed, 100 insertions(+), 50 deletions(-)

New commits:
commit f9271166c2afcf9cad455aac13846bf460e03f3f
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Thu Apr 25 17:23:46 2013 +0000

    i121873 - Add file forgotten to commit with rev. 1471626

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index 74db3aa..f852ed7 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -35,7 +35,7 @@
               <node oor:name="Icon">
                 <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousNormal.png</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:PrevSlide</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:PrevSlide</value></prop>
               <node oor:name="Font">
                 <prop oor:name="Size"><value>12</value></prop>
                 <prop oor:name="Style"><value>Bold</value></prop>
@@ -65,7 +65,7 @@
               <node oor:name="Icon">
                 <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextNormal.png</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:NextEffect</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:NextEffect</value></prop>
               <node oor:name="Font">
                 <prop oor:name="Size"><value>12</value></prop>
                 <prop oor:name="Style"><value>Bold</value></prop>
@@ -95,7 +95,7 @@
               <node oor:name="Icon">
                 <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesNormal.png</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowNotes</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:ShowNotes</value></prop>
               <node oor:name="Font">
                 <prop oor:name="Size"><value>12</value></prop>
                 <prop oor:name="Style"><value>Bold</value></prop>
@@ -118,7 +118,7 @@
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseNotes</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:CloseNotes</value></prop>
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
@@ -134,7 +134,7 @@
               <node oor:name="Icon">
                 <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterNormal.png</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:ShowSlideSorter</value></prop>
               <node oor:name="Font">
                 <prop oor:name="Size"><value>12</value></prop>
                 <prop oor:name="Style"><value>Bold</value></prop>
@@ -157,7 +157,7 @@
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:CloseSlideSorter</value></prop>
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
@@ -225,7 +225,7 @@
               <node oor:name="Icon">
                 <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpNormal.png</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowHelp</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:ShowHelp</value></prop>
               <node oor:name="Font">
                 <prop oor:name="Size"><value>12</value></prop>
                 <prop oor:name="Style"><value>Bold</value></prop>
@@ -248,7 +248,7 @@
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseHelp</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:CloseHelp</value></prop>
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
@@ -279,7 +279,7 @@
               <node oor:name="Icon">
                 <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusNormal.png</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:GrowNotesFont</value></prop>
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
@@ -299,7 +299,7 @@
               <node oor:name="Icon">
                 <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusNormal.png</value></prop>
               </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont</value></prop>
+              <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:ShrinkNotesFont</value></prop>
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
@@ -321,21 +321,21 @@
         <prop oor:name="Text">
           <value xml:lang="en-US">Close</value>
         </prop>
-        <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter</value></prop>
+        <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:CloseSlideSorter</value></prop>
       </node>
       <node oor:name="NotesViewCloser" oor:op="replace">
         <prop oor:name="Name"><value>NotesViewCloser</value></prop>
         <prop oor:name="Text">
           <value xml:lang="en-US">Close</value>
         </prop>
-        <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseNotes</value></prop>
+        <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:CloseNotes</value></prop>
       </node>
       <node oor:name="HelpViewCloser" oor:op="replace">
         <prop oor:name="Name"><value>HelpViewCloser</value></prop>
         <prop oor:name="Text">
           <value xml:lang="en-US">Close</value>
         </prop>
-        <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseHelp</value></prop>
+        <prop oor:name="Action"><value>vnd.com.sun.star.presentation.PresenterScreen:CloseHelp</value></prop>
       </node>
     </node>
     <node oor:name="ScrollBar">
commit 2ec379f0bc8af50ead792677b1f69c61d6903cf3
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Apr 25 13:01:39 2013 +0000

    122141: introduce missing Slot for opening Character Font dialog for Text property panel in Calc

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 53dd827..0eeaa90 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -756,8 +756,9 @@
 
 // Sidebar -------------------------------------------------------------
 
-#define SID_SCGRIDSHOW          (SC_SIDEBAR_PROPERTY_BEGIN+1)
-#define SID_NUMBER_TYPE_FORMAT  (SC_SIDEBAR_PROPERTY_BEGIN+2)
+#define SID_PROPERTY_PANEL_CELLTEXT_DLG (SC_SIDEBAR_PROPERTY_BEGIN+0)
+#define SID_SCGRIDSHOW                  (SC_SIDEBAR_PROPERTY_BEGIN+1)
+#define SID_NUMBER_TYPE_FORMAT          (SC_SIDEBAR_PROPERTY_BEGIN+2)
 
 // Resourcen -------------------------------------------------------------
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 7c18762..916c7e7 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -89,6 +89,7 @@ interface CellSelection
     SID_SELECT_SCENARIO     [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
     FID_CELL_FORMAT         [ ExecMethod = Execute; StateMethod = GetBlockState; ]
     SID_ENABLE_HYPHENATION  [ ExecMethod = Execute; StateMethod = GetBlockState; ]
+    SID_PROPERTY_PANEL_CELLTEXT_DLG [ ExecMethod = Execute;]
     SID_CELL_FORMAT_BORDER  [ ExecMethod = Execute; ]
     SID_CHAR_DLG_EFFECT     [ ExecMethod = Execute; ]
     FID_ROW_HEIGHT          [ ExecMethod = Execute; StateMethod = GetState; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 9d04eaf..317e36d 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -3302,6 +3302,32 @@ SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION
 ]
 
 //--------------------------------------------------------------------------
+
+SfxVoidItem CellTextDlg SID_PROPERTY_PANEL_CELLTEXT_DLG
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = TRUE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Asynchron;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = GID_OPTIONS;
+]
+
+//--------------------------------------------------------------------------
 SfxVoidItem InputLineBlock FID_INPUTLINE_BLOCK
 ()
 [
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 208cfe7..b930981 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -360,6 +360,10 @@ void ScCellShell::Execute( SfxRequest& rReq )
             pTabViewShell->ExecuteCellFormatDlg( rReq, TP_ALIGNMENT );
             break;
 
+        case SID_PROPERTY_PANEL_CELLTEXT_DLG:
+            pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT );
+            break;
+
         case SID_CELL_FORMAT_BORDER:
             pTabViewShell->ExecuteCellFormatDlg( rReq, TP_BORDER );
             break;
commit c4a3b967b0ba367b219ac181fe2ed24a64e3c224
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Apr 25 10:51:17 2013 +0000

    121420: apply context dependent Show Menu Commands according given panel configurations

diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 6192a89..9dc9b1b 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -52,15 +52,13 @@ namespace sfx2 { namespace sidebar {
 Panel::Panel (
     const PanelDescriptor& rPanelDescriptor,
     Window* pParentWindow,
-    const ::boost::function<void(void)>& rDeckLayoutTrigger,
-    const ::boost::function<void(void)>& rShowMenuFunctor)
+    const ::boost::function<void(void)>& rDeckLayoutTrigger )
     : Window(pParentWindow),
       msPanelId(rPanelDescriptor.msId),
       mpTitleBar(new PanelTitleBar(
               rPanelDescriptor.msTitle,
               pParentWindow,
-              this,
-              rShowMenuFunctor)),
+              this)),
       mbIsTitleBarOptional(rPanelDescriptor.mbIsTitleBarOptional),
       mxElement(),
       mxPanelComponent(),
@@ -87,6 +85,17 @@ Panel::~Panel (void)
 
 
 
+void Panel::SetShowMenuFunctor( const ::boost::function<void(void)>& rShowMenuFunctor )
+{
+    if ( mpTitleBar.get() )
+    {
+        mpTitleBar->SetMenuAction( rShowMenuFunctor );
+    }
+}
+
+
+
+
 void Panel::Dispose (void)
 {
     mxPanelComponent = NULL;
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index 6666315..ab19940 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -39,6 +39,7 @@ namespace sfx2 { namespace sidebar {
 
 class PanelDescriptor;
 class TitleBar;
+class PanelTitleBar;
 
 
 class Panel
@@ -48,12 +49,12 @@ public:
     Panel (
         const PanelDescriptor& rPanelDescriptor,
         Window* pParentWindow,
-        const ::boost::function<void(void)>& rDeckLayoutTrigger,
-        const ::boost::function<void(void)>& rShowMenuFunctor);
+        const ::boost::function<void(void)>& rDeckLayoutTrigger );
     virtual ~Panel (void);
 
     void Dispose (void);
 
+    void SetShowMenuFunctor( const ::boost::function<void(void)>& rShowMenuFunctor );
     TitleBar* GetTitleBar (void) const;
     bool IsTitleBarOptional (void) const;
     void SetUIElement (const cssu::Reference<css::ui::XUIElement>& rxElement);
@@ -73,7 +74,7 @@ public:
 
 private:
     const ::rtl::OUString msPanelId;
-    ::boost::scoped_ptr<TitleBar> mpTitleBar;
+    ::boost::scoped_ptr<PanelTitleBar> mpTitleBar;
     const bool mbIsTitleBarOptional;
     cssu::Reference<css::ui::XUIElement> mxElement;
     cssu::Reference<css::ui::XSidebarPanel> mxPanelComponent;
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 5028a93..015dbbe 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -46,24 +46,15 @@ static const sal_Int32 gaRightIconPadding (5);
 PanelTitleBar::PanelTitleBar (
     const ::rtl::OUString& rsTitle,
     Window* pParentWindow,
-    Panel* pPanel,
-    const ::boost::function<void(void)>& rMenuAction)
+    Panel* pPanel )
     : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()),
       mbIsLeftButtonDown(false),
       mpPanel(pPanel),
       mnMenuItemIndex(1),
-      maMenuAction(rMenuAction)
+      maMenuAction()
 {
     OSL_ASSERT(mpPanel != NULL);
 
-    if (maMenuAction)
-    {
-        maToolBox.InsertItem(
-            mnMenuItemIndex,
-            Theme::GetImage(Theme::Image_PanelMenu));
-        maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
-    }
-
 #ifdef DEBUG
     SetText(A2S("PanelTitleBar"));
 #endif
@@ -79,6 +70,25 @@ PanelTitleBar::~PanelTitleBar (void)
 
 
 
+void PanelTitleBar::SetMenuAction ( const ::boost::function<void(void)>& rMenuAction )
+{
+    if ( !maMenuAction && rMenuAction )
+    {
+        maToolBox.InsertItem(
+            mnMenuItemIndex,
+            Theme::GetImage(Theme::Image_PanelMenu));
+        maToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
+    }
+    else if ( maMenuAction && !rMenuAction )
+    {
+        maToolBox.RemoveItem( maToolBox.GetItemPos( mnMenuItemIndex ) );
+    }
+    maMenuAction = rMenuAction;
+}
+
+
+
+
 Rectangle PanelTitleBar::GetTitleArea (const Rectangle& rTitleBarBox)
 {
     if (mpPanel != NULL)
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx
index fc772a9..0861738 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -38,10 +38,11 @@ public:
     PanelTitleBar (
         const ::rtl::OUString& rsTitle,
         Window* pParentWindow,
-        Panel* pPanel,
-        const ::boost::function<void(void)>& rMenuAction);
+        Panel* pPanel );
     virtual ~PanelTitleBar (void);
 
+    void SetMenuAction ( const ::boost::function<void(void)>& rMenuAction );
+
     virtual void DataChanged (const DataChangedEvent& rEvent);
     virtual void MouseButtonDown (const MouseEvent& rMouseEvent);
     virtual void MouseButtonUp (const MouseEvent& rMouseEvent);
@@ -57,7 +58,7 @@ private:
     bool mbIsLeftButtonDown;
     Panel* mpPanel;
     const sal_uInt16 mnMenuItemIndex;
-    const ::boost::function<void(void)> maMenuAction;
+    ::boost::function<void(void)> maMenuAction;
 };
 
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index da4ce2e..b9f3012 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -462,14 +462,18 @@ void SidebarController::SwitchToDeck (
             // Panel does not yet exist.  Create it.
             aNewPanels[nWriteIndex] = CreatePanel(
                 rPanelContexDescriptor.msId,
-                mpCurrentDeck->GetPanelParentWindow(),
-                rPanelContexDescriptor.msMenuCommand);
+                mpCurrentDeck->GetPanelParentWindow());
             bHasPanelSetChanged = true;
         }
         if (aNewPanels[nWriteIndex] != NULL)
         {
             // Depending on the context we have to collapse the panel.
             aNewPanels[nWriteIndex]->SetExpanded(rPanelContexDescriptor.mbIsInitiallyVisible);
+            // Depending on the context we have to apply the show menu functor.
+            aNewPanels[nWriteIndex]->SetShowMenuFunctor(
+                rPanelContexDescriptor.msMenuCommand.getLength()>0
+                ? ::boost::bind(&SidebarController::ShowDetailMenu,this,rPanelContexDescriptor.msMenuCommand)
+                : ::boost::function<void(void)>() );
 
             ++nWriteIndex;
         }
@@ -544,8 +548,7 @@ bool SidebarController::ArePanelSetsEqual (
 
 SharedPanel SidebarController::CreatePanel (
     const OUString& rsPanelId,
-    ::Window* pParentWindow,
-    const OUString& rsMenuCommand)
+    ::Window* pParentWindow )
 {
     const PanelDescriptor* pPanelDescriptor = ResourceManager::Instance().GetPanelDescriptor(rsPanelId);
     if (pPanelDescriptor == NULL)
@@ -555,10 +558,7 @@ SharedPanel SidebarController::CreatePanel (
     SharedPanel pPanel (new Panel(
         *pPanelDescriptor,
         pParentWindow,
-        ::boost::bind(&Deck::RequestLayout, mpCurrentDeck.get()),
-        rsMenuCommand.getLength()>0
-            ? ::boost::bind(&SidebarController::ShowDetailMenu,this,rsMenuCommand)
-            : ::boost::function<void(void)>()));
+        ::boost::bind(&Deck::RequestLayout, mpCurrentDeck.get()) ) );
 
     // Create the XUIElement.
     Reference<ui::XUIElement> xUIElement (CreateUIElement(
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index 49dbc97..be5d04f 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -136,8 +136,7 @@ private:
         const bool bWantsCanvas);
     SharedPanel CreatePanel (
         const ::rtl::OUString& rsPanelId,
-        ::Window* pParentWindow,
-        const ::rtl::OUString& rsMenuCommand);
+        ::Window* pParentWindow );
     void SwitchToDeck (
         const DeckDescriptor& rDeckDescriptor,
         const Context& rContext);
commit 26e4fcdbb8594696b45d0600e1b7a5e5946cd2aa
Author: Andre Fischer <af at apache.org>
Date:   Thu Apr 25 07:10:44 2013 +0000

    122093: Avoid compiler warning in DrawController::BroadcastContextChenge().

diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index a1a1620..47e3692 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -600,6 +600,7 @@ void DrawController::BroadcastContextChange (void) const
 
         case ViewShell::ST_PRESENTATION:
         case ViewShell::ST_NONE:
+        default:
             eContext = EnumContext::Context_Empty;
             break;
     }
commit a8b1ab68ec9232eeb77a79c806347111a4244903
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Apr 25 06:18:22 2013 +0000

    fix RID_SVX_FIRSTFREE
    
    Found By: hdu/orw

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 12ce9fa..7a0dac2 100755
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -30,9 +30,6 @@
 
 // Resource-Id's ------------------------------------------------------------
 
-// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
-#define RID_SVX_FIRSTFREE                   305
-
 // Gallery
 #define RID_CUI_GALLERY_START               (RID_SVX_START + 360)
 #define RID_CUI_GALLERY_END                 (RID_SVX_START + 410)
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 270cf2f..0d93616 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -31,7 +31,7 @@
 // Resource-Id's ------------------------------------------------------------
 
 // !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own)
-#define RID_SVX_FIRSTFREE                   323
+#define RID_SVX_FIRSTFREE                   324
 
 // some strings also used in CUI
 #define RID_SVXERRCTX                       (RID_SVX_START + 351)


More information about the Libreoffice-commits mailing list