[ooo-build-commit] .: 2 commits - patches/dev300 src/default_images
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Sep 29 14:22:01 PDT 2010
dev/null |binary
patches/dev300/apply | 14
patches/dev300/statusbar-fancy-modified-status-sc.diff | 20
patches/dev300/statusbar-fancy-modified-status-sd.diff | 34 -
patches/dev300/statusbar-fancy-modified-status-sfx2.diff | 34 -
patches/dev300/statusbar-fancy-modified-status-starmath.diff | 42 -
patches/dev300/statusbar-fancy-modified-status-svx.diff | 262 -----------
patches/dev300/statusbar-fancy-modified-status-sw.diff | 111 ----
8 files changed, 1 insertion(+), 516 deletions(-)
New commits:
commit 1b42af7cb4167ca386ec35c91dbadb2121bc61ec
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 29 17:17:36 2010 -0400
Removed the document modified icon; moved to the artwork repo.
diff --git a/src/default_images/svx/res/doc_modified_no_14.png b/src/default_images/svx/res/doc_modified_no_14.png
deleted file mode 100644
index 1f4395a..0000000
Binary files a/src/default_images/svx/res/doc_modified_no_14.png and /dev/null differ
diff --git a/src/default_images/svx/res/doc_modified_yes_14.png b/src/default_images/svx/res/doc_modified_yes_14.png
deleted file mode 100644
index 6c2504b..0000000
Binary files a/src/default_images/svx/res/doc_modified_yes_14.png and /dev/null differ
commit 1480489c4720bfd1ce0837e44ec3e7758745a2bc
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Wed Sep 29 17:13:11 2010 -0400
Removed statusbar-fancy-modified-status-*.diff; moved to the split repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 567197e..9cbe01f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -15,7 +15,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
Icons, CalcFixes, WriterFixes, EasterEgg, \
GStreamer, CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
Layout, VBABits, VBAObjects, CalcErrors, GCJ, Lwp, \
- OOXML, OOXMLExportDevel, OOXMLExport, FrameworkFeature, UnitTesting, \
+ OOXML, OOXMLExportDevel, OOXMLExport, UnitTesting, \
FedoraCommonFixes, LayoutDialogs, Fuzz, \
CalcRowLimit, BuildFix, WriterDocComparison, \
MySQL, BorderTypes, WriterNavigation
@@ -1872,18 +1872,6 @@ layout-disabled-layout-build-fix.diff, pmladek
# should replace layout-localize-fix-sc.diff
layout-generate-localize-sdf.diff, deb#570378, pmladek
-[ FrameworkFeature ]
-SectionOwner => kohei
-SectionIssue => i#62234
-
-# Fancy document modified status window
-statusbar-fancy-modified-status-sc.diff, i#103862, kohei
-statusbar-fancy-modified-status-sd.diff, i#103862, kohei
-statusbar-fancy-modified-status-sfx2.diff, i#103862, kohei
-statusbar-fancy-modified-status-starmath.diff, i#103862, kohei
-statusbar-fancy-modified-status-svx.diff, i#103862, kohei
-statusbar-fancy-modified-status-sw.diff, i#103862, kohei
-
[ UnitTesting ]
SectionOwner => jholesov
SectionIssue => i#87469
diff --git a/patches/dev300/statusbar-fancy-modified-status-sc.diff b/patches/dev300/statusbar-fancy-modified-status-sc.diff
deleted file mode 100644
index c58e35e..0000000
--- a/patches/dev300/statusbar-fancy-modified-status-sc.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sc/uiconfig/scalc/statusbar/statusbar.xml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sc/uiconfig/scalc/statusbar/statusbar.xml sc/uiconfig/scalc/statusbar/statusbar.xml
-index 1ddff7a..28dfaf4 100644
---- sc/uiconfig/scalc/statusbar/statusbar.xml
-+++ sc/uiconfig/scalc/statusbar/statusbar.xml
-@@ -5,7 +5,7 @@
- <statusbar:statusbaritem xlink:href=".uno:StatusPageStyle" statusbar:align="left" statusbar:autosize="true" statusbar:width="83" statusbar:helpid="helpid:26115"/>
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="41" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:StatusSelectionMode" statusbar:align="center" statusbar:width="34" statusbar:helpid="helpid:26116"/>
-- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="18" statusbar:helpid="helpid:5584"/>
-+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="18" 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="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"/>
---
-1.7.0.1
-
diff --git a/patches/dev300/statusbar-fancy-modified-status-sd.diff b/patches/dev300/statusbar-fancy-modified-status-sd.diff
deleted file mode 100644
index c3cfdf9..0000000
--- a/patches/dev300/statusbar-fancy-modified-status-sd.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- sd/uiconfig/sdraw/statusbar/statusbar.xml | 2 +-
- sd/uiconfig/simpress/statusbar/statusbar.xml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-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"/>
---
-1.7.0.1
-
diff --git a/patches/dev300/statusbar-fancy-modified-status-sfx2.diff b/patches/dev300/statusbar-fancy-modified-status-sfx2.diff
deleted file mode 100644
index 968cf5c..0000000
--- a/patches/dev300/statusbar-fancy-modified-status-sfx2.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- sfx2/sdi/sfx.sdi | 2 +-
- sfx2/source/doc/objserv.cxx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git sfx2/sdi/sfx.sdi sfx2/sdi/sfx.sdi
-index 2e2d432..92a4979 100644
---- sfx2/sdi/sfx.sdi
-+++ sfx2/sdi/sfx.sdi
-@@ -3856,7 +3856,7 @@ SfxBoolItem Modified SID_MODIFIED
- ]
-
- //--------------------------------------------------------------------------
--SfxStringItem ModifiedStatus SID_DOC_MODIFIED
-+SfxBoolItem ModifiedStatus SID_DOC_MODIFIED
-
- [
- /* flags: */
-diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
-index 795f5a2..7f784db 100644
---- sfx2/source/doc/objserv.cxx
-+++ sfx2/source/doc/objserv.cxx
-@@ -1022,7 +1022,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
-
- case SID_DOC_MODIFIED:
- {
-- rSet.Put( SfxStringItem( SID_DOC_MODIFIED, IsModified() ? '*' : ' ' ) );
-+ rSet.Put( SfxBoolItem( SID_DOC_MODIFIED, IsModified() ) );
- break;
- }
-
---
-1.7.0.1
-
diff --git a/patches/dev300/statusbar-fancy-modified-status-starmath.diff b/patches/dev300/statusbar-fancy-modified-status-starmath.diff
deleted file mode 100644
index 7dd8ce6..0000000
--- a/patches/dev300/statusbar-fancy-modified-status-starmath.diff
+++ /dev/null
@@ -1,42 +0,0 @@
----
- starmath/source/smmod.cxx | 3 +++
- starmath/uiconfig/smath/statusbar/statusbar.xml | 2 +-
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git starmath/source/smmod.cxx starmath/source/smmod.cxx
-index ca4bcf9..f96760b 100644
---- starmath/source/smmod.cxx
-+++ starmath/source/smmod.cxx
-@@ -55,6 +55,7 @@
- #include "edit.hxx"
- #include "view.hxx"
- #include "starmath.hrc"
-+#include "svx/modctrl.hxx"
-
- TYPEINIT1( SmModule, SfxModule );
-
-@@ -242,6 +243,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
---
-1.7.0.1
-
diff --git a/patches/dev300/statusbar-fancy-modified-status-svx.diff b/patches/dev300/statusbar-fancy-modified-status-svx.diff
deleted file mode 100644
index debe89e..0000000
--- a/patches/dev300/statusbar-fancy-modified-status-svx.diff
+++ /dev/null
@@ -1,262 +0,0 @@
----
- svx/inc/modctrl.hxx | 12 ++--
- svx/inc/svx/dialogs.hrc | 4 ++
- svx/source/stbctrls/makefile.mk | 1 +
- svx/source/stbctrls/modctrl.cxx | 103 +++++++++++++++++++++++++++++--------
- svx/source/stbctrls/stbctrls.src | 26 ++++++++++
- 5 files changed, 117 insertions(+), 29 deletions(-)
-
-diff --git svx/inc/modctrl.hxx svx/inc/modctrl.hxx
-index c03617e..1b56689 100644
---- svx/inc/modctrl.hxx
-+++ svx/inc/modctrl.hxx
-@@ -32,6 +32,8 @@
- #include <sfx2/stbitem.hxx>
- #include "svx/svxdllapi.h"
-
-+#include <boost/shared_ptr.hpp>
-+
- // class SvxModifyControl ------------------------------------------------
-
- class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
-@@ -39,7 +41,8 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
- public:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
- const SfxPoolItem* pState );
-- virtual void Paint( const UserDrawEvent& rEvt );
-+ virtual void Paint( const UserDrawEvent& rUsrEvt );
-+ virtual void DoubleClick();
-
- SFX_DECL_STATUSBAR_CONTROL();
-
-@@ -48,11 +51,8 @@ public:
- static ULONG GetDefItemWidth(const StatusBar& rStb);
-
- private:
-- BOOL bState;
--
--#ifdef _SVX_MODCTRL_CXX
-- SVX_DLLPRIVATE void DrawItemText_Impl();
--#endif
-+ struct ImplData;
-+ ::boost::shared_ptr<ImplData> mpImpl;
- };
-
-
-diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc
-index cb56b02..67df9fa 100755
---- svx/inc/svx/dialogs.hrc
-+++ svx/inc/svx/dialogs.hrc
-@@ -1059,5 +1059,9 @@
- #define SVX_OOO_BUILD_START (RID_SVX_START + 1200)
-
- #define SID_SC_TP_FORMULA (SVX_OOO_BUILD_START + 1)
-+#define RID_SVXBMP_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 2)
-+#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 3)
-+#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4)
-+#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5)
-
- #endif
-diff --git svx/source/stbctrls/makefile.mk svx/source/stbctrls/makefile.mk
-index 4e125ad..0cd8594 100644
---- svx/source/stbctrls/makefile.mk
-+++ svx/source/stbctrls/makefile.mk
-@@ -55,6 +55,7 @@ SLOFILES= \
- $(SLO)$/zoomsliderctrl.obj
-
- EXCEPTIONSFILES= \
-+ $(SLO)$/modctrl.obj \
- $(SLO)$/zoomsliderctrl.obj
-
- HXX1TARGET=stbctrls
-diff --git svx/source/stbctrls/modctrl.cxx svx/source/stbctrls/modctrl.cxx
-index 9b4fbd3..8054a32 100644
---- svx/source/stbctrls/modctrl.cxx
-+++ svx/source/stbctrls/modctrl.cxx
-@@ -30,29 +30,47 @@
-
- // include ---------------------------------------------------------------
-
--#ifndef _STATUS_HXX //autogen
-+#include "modctrl.hxx"
-+
- #include <vcl/status.hxx>
--#endif
-+#include <vcl/image.hxx>
- #include <svl/eitem.hxx>
- #include <sfx2/app.hxx>
-
--#define _SVX_MODCTRL_CXX
--
- #include <svx/dialogs.hrc>
--
--#include "modctrl.hxx"
- #include <svx/dialmgr.hxx>
-
-+#include <com/sun/star/beans/PropertyValue.hpp>
-+
-+using ::com::sun::star::uno::Sequence;
-+using ::com::sun::star::beans::PropertyValue;
-+using ::rtl::OUString;
-+
- SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem);
-
- // class SvxModifyControl ------------------------------------------------
-
-+struct SvxModifyControl::ImplData
-+{
-+ Image maModifiedButton;
-+ Image maNonModifiedButton;
-+
-+ bool mbModified;
-+
-+ ImplData() :
-+ maModifiedButton( SVX_RES(RID_SVXBMP_DOC_MODIFIED_YES) ),
-+ maNonModifiedButton( SVX_RES(RID_SVXBMP_DOC_MODIFIED_NO) ),
-+ mbModified(false)
-+ {
-+ }
-+};
-+
- SvxModifyControl::SvxModifyControl( USHORT _nSlotId,
- USHORT _nId,
- StatusBar& rStb ) :
-
- SfxStatusBarControl( _nSlotId, _nId, rStb ),
-- bState( TRUE )
-+ mpImpl(new ImplData)
- {
- }
-
-@@ -62,32 +80,71 @@ void SvxModifyControl::StateChanged( USHORT, SfxItemState eState,
- const SfxPoolItem* pState )
- {
- if ( SFX_ITEM_AVAILABLE != eState )
-- GetStatusBar().SetItemText( GetId(), String() );
-- else
-- {
-- DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" );
-- SfxBoolItem* pItem = (SfxBoolItem*)pState;
-- bState = pItem->GetValue();
-- DrawItemText_Impl();
-- }
-+ return;
-+
-+ DBG_ASSERT( pState->ISA( SfxBoolItem ), "invalid item type" );
-+ SfxBoolItem* pItem = (SfxBoolItem*)pState;
-+ mpImpl->mbModified = pItem->GetValue();
-+
-+ if ( GetStatusBar().AreItemsVisible() )
-+ GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
-+
-+ int nResId = mpImpl->mbModified ? RID_SVXSTR_DOC_MODIFIED_YES : RID_SVXSTR_DOC_MODIFIED_NO;
-+ GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(nResId));
- }
-
- // -----------------------------------------------------------------------
-
--void SvxModifyControl::Paint( const UserDrawEvent& )
-+namespace {
-+
-+/**
-+ * Given a bounding rectangle and an image, determine the top-left position
-+ * of the image so that the image would look centered both horizontally and
-+ * vertically.
-+ *
-+ * @param rBoundingRect bounding rectangle
-+ * @param rImg image
-+ *
-+ * @return Point top-left corner of the centered image position
-+ */
-+Point centerImage(const Rectangle& rBoundingRect, const Image& rImg)
- {
-- DrawItemText_Impl();
-+ Size aImgSize = rImg.GetSizePixel();
-+ Size aRectSize = rBoundingRect.GetSize();
-+ long nXOffset = (aRectSize.getWidth() - aImgSize.getWidth())/2;
-+ long nYOffset = (aRectSize.getHeight() - aImgSize.getHeight())/2;
-+ Point aPt = rBoundingRect.TopLeft();
-+ aPt += Point(nXOffset, nYOffset);
-+ return aPt;
- }
-
--// -----------------------------------------------------------------------
-+}
-+void SvxModifyControl::Paint( const UserDrawEvent& rUsrEvt )
-+{
-+ const Rectangle aControlRect = getControlRect();
-+ OutputDevice* pDev = rUsrEvt.GetDevice();
-+ Rectangle aRect = rUsrEvt.GetRect();
-+
-+ if (mpImpl->mbModified)
-+ {
-+ Point aPt = centerImage(aRect, mpImpl->maModifiedButton);
-+ pDev->DrawImage(aPt, mpImpl->maModifiedButton);
-+ }
-+ else
-+ {
-+ Point aPt = centerImage(aRect, mpImpl->maNonModifiedButton);
-+ pDev->DrawImage(aPt, mpImpl->maNonModifiedButton);
-+ }
-+}
-
--void SvxModifyControl::DrawItemText_Impl()
-+void SvxModifyControl::DoubleClick()
- {
-- String sMode;
-+ if (!mpImpl->mbModified)
-+ // document not modified. nothing to do here.
-+ return;
-
-- if ( bState )
-- sMode = '*';
-- GetStatusBar().SetItemText( GetId(), sMode );
-+ Sequence<PropertyValue> aArgs;
-+ execute(OUString::createFromAscii(".uno:Save"), aArgs);
- }
-
- ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
-diff --git svx/source/stbctrls/stbctrls.src svx/source/stbctrls/stbctrls.src
-index 7520e4f..80f150a 100644
---- svx/source/stbctrls/stbctrls.src
-+++ svx/source/stbctrls/stbctrls.src
-@@ -89,6 +89,16 @@ String RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG
- Text [ en-US ] = "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed.";
- };
-
-+String RID_SVXSTR_DOC_MODIFIED_YES
-+{
-+ Text [ en-US ] = "The document has been modified. Double-click to save the document.";
-+};
-+
-+String RID_SVXSTR_DOC_MODIFIED_NO
-+{
-+ Text [ en-US ] = "The document has not been modified since the last save.";
-+};
-+
- // PopupMenu -------------------------------------------------------------
- Menu RID_SVXMNU_ZOOM
- {
-@@ -325,3 +335,19 @@ Image RID_SVXBMP_SLIDERINCREASE_HC
- MaskColor = STD_MASKCOLOR;
- };
-
-+Image RID_SVXBMP_DOC_MODIFIED_YES
-+{
-+ ImageBitmap = Bitmap
-+ {
-+ File = "doc_modified_yes_14.png" ;
-+ };
-+ MaskColor = STD_MASKCOLOR;
-+};
-+Image RID_SVXBMP_DOC_MODIFIED_NO
-+{
-+ ImageBitmap = Bitmap
-+ {
-+ File = "doc_modified_no_14.png" ;
-+ };
-+ MaskColor = STD_MASKCOLOR;
-+};
---
-1.7.0.1
-
diff --git a/patches/dev300/statusbar-fancy-modified-status-sw.diff b/patches/dev300/statusbar-fancy-modified-status-sw.diff
deleted file mode 100644
index 2b30c8b..0000000
--- a/patches/dev300/statusbar-fancy-modified-status-sw.diff
+++ /dev/null
@@ -1,111 +0,0 @@
----
- sw/source/ui/app/swmodule.cxx | 2 ++
- sw/uiconfig/sglobal/statusbar/statusbar.xml | 2 +-
- sw/uiconfig/sweb/statusbar/statusbar.xml | 2 +-
- sw/uiconfig/swform/statusbar/statusbar.xml | 2 +-
- sw/uiconfig/swreport/statusbar/statusbar.xml | 2 +-
- sw/uiconfig/swriter/statusbar/statusbar.xml | 2 +-
- sw/uiconfig/swxform/statusbar/statusbar.xml | 2 +-
- 7 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git sw/source/ui/app/swmodule.cxx sw/source/ui/app/swmodule.cxx
-index 5625223..010bae1 100644
---- sw/source/ui/app/swmodule.cxx
-+++ sw/source/ui/app/swmodule.cxx
-@@ -66,6 +66,7 @@
- #include <svx/hyperdlg.hxx>
- #include <svx/extrusioncolorcontrol.hxx>
- #include <svx/fontworkgallery.hxx>
-+#include <svx/modctrl.hxx>
- #include <com/sun/star/scanner/XScannerManager.hpp>
- #include <com/sun/star/container/XSet.hpp>
- #include <comphelper/processfactory.hxx>
-@@ -423,6 +424,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 24ec903..f688036 100644
---- sw/uiconfig/swform/statusbar/statusbar.xml
-+++ sw/uiconfig/swform/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/swreport/statusbar/statusbar.xml sw/uiconfig/swreport/statusbar/statusbar.xml
-index 24ec903..f688036 100644
---- sw/uiconfig/swreport/statusbar/statusbar.xml
-+++ sw/uiconfig/swreport/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/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"/>
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list