[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - 2 commits - patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jun 11 03:24:16 PDT 2010
patches/dev300/novell-palette.diff | 6 +++-
patches/dev300/toolbar-decorations-rsc.diff | 5 +--
patches/dev300/toolbar-decorations-vcl.diff | 37 ++++++++++++++++++++++------
3 files changed, 36 insertions(+), 12 deletions(-)
New commits:
commit c2fbef152566f24c9bcfd74d638e78a1eed95c4d
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 11 12:20:58 2010 +0200
Remove one color from the OOo palette when installing the Novell colors.
With the Novell colors, we have 111 in total, which introduces a scrollbar for
just one color (the matrix is 10x11).
* patches/dev300/novell-palette.diff:
diff --git a/patches/dev300/novell-palette.diff b/patches/dev300/novell-palette.diff
index 18202a6..cc8034d 100644
--- a/patches/dev300/novell-palette.diff
+++ b/patches/dev300/novell-palette.diff
@@ -1,8 +1,10 @@
--- extras/source/palettes/standard.soc.old1 2001-03-16 14:44:46.000000000 +0100
+++ extras/source/palettes/standard.soc 2006-01-30 15:14:54.000000000 +0100
-@@ -88,6 +88,18 @@
+@@ -88,8 +88,19 @@
+ <draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
+ <draw:color draw:name="Pale green" draw:color="#ccffff"/>
<draw:color draw:name="Dark violet" draw:color="#660066"/>
- <draw:color draw:name="Salmon" draw:color="#ff8080"/>
+- <draw:color draw:name="Salmon" draw:color="#ff8080"/>
<draw:color draw:name="Sea blue" draw:color="#0066cc"/>
+ <draw:color draw:name="openSUSE light green" draw:color="#bddd8d"/>
+ <draw:color draw:name="openSUSE medium green" draw:color="#198533"/>
commit a47f21813f5724e78d5e1f68481ddf486e2e1fb1
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 11 12:18:41 2010 +0200
Fix the New table toolbar tool, n#612013.
In one case, it was hidden by other toolbars. This also makes the patch even
less intrusive :-)
* patches/dev300/toolbar-decorations-rsc.diff: Update.
* patches/dev300/toolbar-decorations-vcl.diff:
diff --git a/patches/dev300/toolbar-decorations-rsc.diff b/patches/dev300/toolbar-decorations-rsc.diff
index a68a6e6..0037d62 100644
--- a/patches/dev300/toolbar-decorations-rsc.diff
+++ b/patches/dev300/toolbar-decorations-rsc.diff
@@ -14,13 +14,12 @@ diff --git rsc/inc/vclrsc.hxx rsc/inc/vclrsc.hxx
index 3a28ea0..81bf445 100644
--- rsc/inc/vclrsc.hxx
+++ rsc/inc/vclrsc.hxx
-@@ -84,6 +84,11 @@ typedef sal_Int64 WinBits;
+@@ -84,6 +84,10 @@ typedef sal_Int64 WinBits;
#define WB_AUTOVSCROLL ((WinBits)0x40000000)
#define WB_HIDE ((WinBits)0x80000000)
+
+// system floating window
-+#define WB_OWNERDRAWDECORATION ((WinBits)0x10000000)
+#define WB_POPUP ((WinBits)0x20000000)
+
#define WB_HSCROLL WB_HORZ
@@ -30,7 +29,7 @@ index 3a28ea0..81bf445 100644
#define WB_STDMODAL (WB_STDDIALOG)
#define WB_STDTABDIALOG (WB_STDDIALOG)
#define WB_STDTABCONTROL 0
-+#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_OWNERDRAWDECORATION | WB_3DLOOK | WB_DIALOGCONTROL)
++#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL)
// For TreeListBox
#define WB_HASBUTTONS ((WinBits)0x00800000)
diff --git a/patches/dev300/toolbar-decorations-vcl.diff b/patches/dev300/toolbar-decorations-vcl.diff
index 70361cb..453da6d 100644
--- a/patches/dev300/toolbar-decorations-vcl.diff
+++ b/patches/dev300/toolbar-decorations-vcl.diff
@@ -30,12 +30,8 @@ diff --git vcl/inc/vcl/wintypes.hxx vcl/inc/vcl/wintypes.hxx
index 6abe87d..02f4a4a 100644
--- vcl/inc/vcl/wintypes.hxx
+++ vcl/inc/vcl/wintypes.hxx
-@@ -190,9 +190,10 @@ typedef sal_Int64 WinBits;
- #define WB_INTROWIN ((WinBits)SAL_CONST_INT64(0x200000000))
- #define WB_NOSHADOW ((WinBits)SAL_CONST_INT64(0x400000000))
- #define WB_TOOLTIPWIN ((WinBits)SAL_CONST_INT64(0x800000000))
--#define WB_OWNERDRAWDECORATION ((WinBits)SAL_CONST_INT64(0x2000000000))
-+#define WB_OWNERDRAWDECORATION ((WinBits)SAL_CONST_INT64(0x10000000))
+@@ -190,6 +190,7 @@ typedef sal_Int64 WinBits;
+ #define WB_OWNERDRAWDECORATION ((WinBits)SAL_CONST_INT64(0x2000000000))
#define WB_DEFAULTWIN ((WinBits)SAL_CONST_INT64(0x4000000000))
#define WB_NEEDSFOCUS ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_POPUP ((WinBits)SAL_CONST_INT64(0x20000000))
@@ -46,7 +42,7 @@ index 6abe87d..02f4a4a 100644
#define WB_STDMODAL (WB_STDDIALOG)
#define WB_STDTABDIALOG (WB_STDDIALOG)
#define WB_STDTABCONTROL 0
-+#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_OWNERDRAWDECORATION | WB_3DLOOK | WB_DIALOGCONTROL)
++#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL)
// For TreeListBox
#define WB_HASBUTTONS ((WinBits)0x00800000)
@@ -77,6 +73,15 @@ index 4bebcd9..9b0d610 100644
(pData->mnTitleType == BORDERWINDOW_TITLE_NONE) )
{
pData->mnTitleType = BORDERWINDOW_TITLE_NONE;
+@@ -276,7 +276,7 @@ USHORT ImplBorderWindowView::ImplHitTest
+
+ // no corner resize for floating toolbars, which would lead to jumps while formatting
+ // setting nSizeWidth = 0 will only return pure left,top,right,bottom
+- if( pBorderWindow->GetStyle() & WB_OWNERDRAWDECORATION )
++ if( pBorderWindow->GetStyle() & (WB_OWNERDRAWDECORATION | WB_POPUP) )
+ nSizeWidth = 0;
+
+ if ( rPos.X() < pData->mnLeftBorder )
@@ -1495,7 +1495,7 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
pData->mnTitleType = pBorderWindow->mnTitleType;
pData->mbFloatWindow = pBorderWindow->mbFloatWindow;
@@ -163,6 +168,24 @@ index 4bebcd9..9b0d610 100644
if ( nTypeStyle & BORDERWINDOW_STYLE_APP )
nTestStyle |= WB_APP;
nStyle &= nTestStyle;
+@@ -1880,7 +1880,7 @@ void ImplBorderWindow::ImplInit( Window*
+ mpWindowImpl->mbFrame = TRUE;
+ mbFrameBorder = FALSE;
+ }
+- else if( (nStyle & WB_OWNERDRAWDECORATION) )
++ else if( (nStyle & (WB_OWNERDRAWDECORATION | WB_POPUP)) )
+ {
+ mpWindowImpl->mbOverlapWin = TRUE;
+ mpWindowImpl->mbFrame = TRUE;
+@@ -2132,7 +2132,7 @@ void ImplBorderWindow::DataChanged( cons
+ ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
+ (rDCEvt.GetFlags() & SETTINGS_STYLE)) )
+ {
+- if ( !mpWindowImpl->mbFrame || (GetStyle() & WB_OWNERDRAWDECORATION) )
++ if ( !mpWindowImpl->mbFrame || (GetStyle() & (WB_OWNERDRAWDECORATION | WB_POPUP)) )
+ UpdateView( TRUE, ImplGetWindow()->GetOutputSizePixel() );
+ }
+
diff --git vcl/source/window/floatwin.cxx vcl/source/window/floatwin.cxx
index 0d39900..117a9fd 100644
--- vcl/source/window/floatwin.cxx
More information about the ooo-build-commit
mailing list