[ooo-build-commit] patches/test

[Kohei Yoshida]

 patches/test/statusbar-fancy-modified-status.diff |  158 ++++++++++++++++++++++
 1 file changed, 158 insertions(+)

New commits:
commit f2ee95d98805c682440d9c35058be7364c84f72c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Jul 24 00:11:55 2009 -0400

    WIP: Use the new document modified status control for all apps.
    
    * patches/test/statusbar-fancy-modified-status.diff:

diff --git a/patches/test/statusbar-fancy-modified-status.diff b/patches/test/statusbar-fancy-modified-status.diff
index 43e9399..eea2eb4 100644
--- a/patches/test/statusbar-fancy-modified-status.diff
+++ b/patches/test/statusbar-fancy-modified-status.diff
@@ -11,6 +11,32 @@ index 1ddff7a..28dfaf4 100644
   <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
   <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="212" statusbar:helpid="helpid:10224"/>
   <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="140" statusbar:helpid="helpid:11065"/>
+diff --git sd/uiconfig/sdraw/statusbar/statusbar.xml sd/uiconfig/sdraw/statusbar/statusbar.xml
+index e657e64..0872bd4 100644
+--- sd/uiconfig/sdraw/statusbar/statusbar.xml
++++ sd/uiconfig/sdraw/statusbar/statusbar.xml
+@@ -3,7 +3,7 @@
+ <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="184" statusbar:helpid="helpid:5310"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="208" statusbar:helpid="helpid:10224"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="14" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:PageStatus" statusbar:align="left" statusbar:width="124" statusbar:helpid="helpid:27086"/>
+  <statusbar:statusbaritem xlink:href=".uno:LayoutStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:27087"/>
+diff --git sd/uiconfig/simpress/statusbar/statusbar.xml sd/uiconfig/simpress/statusbar/statusbar.xml
+index e657e64..0872bd4 100644
+--- sd/uiconfig/simpress/statusbar/statusbar.xml
++++ sd/uiconfig/simpress/statusbar/statusbar.xml
+@@ -3,7 +3,7 @@
+ <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <statusbar:statusbaritem xlink:href=".uno:Context" statusbar:align="left" statusbar:autosize="true" statusbar:width="184" statusbar:helpid="helpid:5310"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="208" statusbar:helpid="helpid:10224"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="14" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:PageStatus" statusbar:align="left" statusbar:width="124" statusbar:helpid="helpid:27086"/>
+  <statusbar:statusbaritem xlink:href=".uno:LayoutStatus" statusbar:align="left" statusbar:autosize="true" statusbar:width="54" statusbar:helpid="helpid:27087"/>
 diff --git sfx2/sdi/sfx.sdi sfx2/sdi/sfx.sdi
 index 41e1df9..dcce53b 100644
 --- sfx2/sdi/sfx.sdi
@@ -37,6 +63,40 @@ index 1ee9eb6..9e0936a 100644
                  break;
              }
  
+diff --git starmath/source/smmod.cxx starmath/source/smmod.cxx
+index 6351b7b..bbfefb7 100644
+--- starmath/source/smmod.cxx
++++ starmath/source/smmod.cxx
+@@ -58,6 +58,7 @@
+ #include "edit.hxx"
+ #include "view.hxx"
+ #include "starmath.hrc"
++#include "svx/modctrl.hxx"
+ 
+ TYPEINIT1( SmModule, SfxModule );
+ 
+@@ -245,6 +246,8 @@ SmModule::SmModule(SfxObjectFactory* pObjFact) :
+     pVirtualDev( 0 )
+ {
+     SetName( C2S("StarMath" ));
++
++    SvxModifyControl::RegisterControl(SID_DOC_MODIFIED, this);
+ }
+ 
+ 
+diff --git starmath/uiconfig/smath/statusbar/statusbar.xml starmath/uiconfig/smath/statusbar/statusbar.xml
+index 7d95fbb..33e4e48 100644
+--- starmath/uiconfig/smath/statusbar/statusbar.xml
++++ starmath/uiconfig/smath/statusbar/statusbar.xml
+@@ -3,6 +3,6 @@
+ <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <statusbar:statusbaritem xlink:href=".uno:TextStatus" statusbar:align="left" statusbar:width="300" statusbar:helpid="helpid:30367"/>
+  <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="54" statusbar:helpid="helpid:10000"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="14" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="14" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+ </statusbar:statusbar>
+\ No newline at end of file
 diff --git svx/inc/modctrl.hxx svx/inc/modctrl.hxx
 index e1f41a8..5941e89 100644
 --- svx/inc/modctrl.hxx
@@ -255,3 +315,101 @@ index b4dac87..018af03 100644
 +    };
 +    MaskColor = STD_MASKCOLOR;
 +};
+diff --git sw/source/ui/app/swmodule.cxx sw/source/ui/app/swmodule.cxx
+index 0e4c70c..4a0fee9 100644
+--- sw/source/ui/app/swmodule.cxx
++++ sw/source/ui/app/swmodule.cxx
+@@ -70,6 +70,7 @@
+ #include <svx/imapdlg.hxx>
+ #include <svx/srchdlg.hxx>
+ #include <svx/hyperdlg.hxx>
++#include <svx/modctrl.hxx>
+ #include <com/sun/star/scanner/XScannerManager.hpp>
+ #include <com/sun/star/container/XSet.hpp>
+ #include <comphelper/processfactory.hxx>
+@@ -439,6 +440,7 @@ void SwDLL::RegisterControls()
+     SwBookmarkControl::RegisterControl(FN_STAT_PAGE, pMod );
+     SwTemplateControl::RegisterControl(FN_STAT_TEMPLATE, pMod );
+     SwViewLayoutControl::RegisterControl( SID_ATTR_VIEWLAYOUT, pMod );
++    SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
+     SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
+ 
+     SwTableOptimizeCtrl::RegisterControl(FN_OPTIMIZE_TABLE, pMod);
+diff --git sw/uiconfig/sglobal/statusbar/statusbar.xml sw/uiconfig/sglobal/statusbar/statusbar.xml
+index ed69b12..3e46300 100644
+--- sw/uiconfig/sglobal/statusbar/statusbar.xml
++++ sw/uiconfig/sglobal/statusbar/statusbar.xml
+@@ -6,7 +6,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
+  <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
+  <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
+  <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63" statusbar:helpid="helpid:11064"/>
+diff --git sw/uiconfig/sweb/statusbar/statusbar.xml sw/uiconfig/sweb/statusbar/statusbar.xml
+index 24ec903..f688036 100644
+--- sw/uiconfig/sweb/statusbar/statusbar.xml
++++ sw/uiconfig/sweb/statusbar/statusbar.xml
+@@ -6,7 +6,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
+  <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
+  <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
+  <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="130" statusbar:helpid="helpid:11065"/>
+diff --git sw/uiconfig/swform/statusbar/statusbar.xml sw/uiconfig/swform/statusbar/statusbar.xml
+index 58d7b18..5f9150d 100644
+--- sw/uiconfig/swform/statusbar/statusbar.xml
++++ sw/uiconfig/swform/statusbar/statusbar.xml
+@@ -7,7 +7,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
+  <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
+  <statusbar:statusbaritem xlink:href=".uno:ExecHyperlinks" statusbar:align="center" statusbar:width="22" statusbar:helpid="helpid:21186"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
+ </statusbar:statusbar>
+diff --git sw/uiconfig/swreport/statusbar/statusbar.xml sw/uiconfig/swreport/statusbar/statusbar.xml
+index 58d7b18..5f9150d 100644
+--- sw/uiconfig/swreport/statusbar/statusbar.xml
++++ sw/uiconfig/swreport/statusbar/statusbar.xml
+@@ -7,7 +7,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
+  <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
+  <statusbar:statusbaritem xlink:href=".uno:ExecHyperlinks" statusbar:align="center" statusbar:width="22" statusbar:helpid="helpid:21186"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
+ </statusbar:statusbar>
+diff --git sw/uiconfig/swriter/statusbar/statusbar.xml sw/uiconfig/swriter/statusbar/statusbar.xml
+index ed69b12..3e46300 100644
+--- sw/uiconfig/swriter/statusbar/statusbar.xml
++++ sw/uiconfig/swriter/statusbar/statusbar.xml
+@@ -6,7 +6,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
+  <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
+  <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
+  <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63" statusbar:helpid="helpid:11064"/>
+diff --git sw/uiconfig/swxform/statusbar/statusbar.xml sw/uiconfig/swxform/statusbar/statusbar.xml
+index ed69b12..3e46300 100644
+--- sw/uiconfig/swxform/statusbar/statusbar.xml
++++ sw/uiconfig/swxform/statusbar/statusbar.xml
+@@ -6,7 +6,7 @@
+  <statusbar:statusbaritem xlink:href=".uno:LanguageStatus" statusbar:align="center" statusbar:autosize="true" statusbar:width="100" />
+  <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="37" statusbar:helpid="helpid:10221"/>
+  <statusbar:statusbaritem xlink:href=".uno:SelectionMode" statusbar:align="center" statusbar:width="30" statusbar:helpid="helpid:21185"/>
+- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="9" statusbar:helpid="helpid:5584"/>
++ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="9" statusbar:helpid="helpid:5584"/>
+  <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
+  <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="left" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="129" statusbar:helpid="helpid:10224"/>
+  <statusbar:statusbaritem xlink:href=".uno:ViewLayout" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="63" statusbar:helpid="helpid:11064"/>