[ooo-build-commit] .: 2 commits - configure.in patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Feb 17 02:03:59 PST 2010
configure.in | 2
patches/dev300/apply | 8 +
patches/dev300/toolbar-decorations-fix.diff | 160 +++-------------------------
3 files changed, 29 insertions(+), 141 deletions(-)
New commits:
commit c2510afef6ad920699896dd9437771964eb47aa6
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Feb 17 10:15:59 2010 +0100
Update the toolbar decorations fixes to apply again.
The patch was conflicting with cws-cbosdo01.diff, fixed. Also, made the patch
applying always, so that we don't forget to update it if necessary ;-)
* patches/dev300/apply: New section [ Toolbars ].
* patches/dev300/toolbar-decorations-fix.diff: Update.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 16812c1..b83dee3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -18,7 +18,8 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
OOXML, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
- CalcRowLimit, Gcc44, BuildFix, WriterDocComparison, OptionalIconThemes
+ CalcRowLimit, Gcc44, BuildFix, WriterDocComparison, \
+ OptionalIconThemes, Toolbars
LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
@@ -3593,3 +3594,8 @@ svx-validate-paradepth.diff, thorsten
vcl-pngread-greypalette-fix.diff, thorsten
svx-textpropreader-limit-fix.diff, thorsten
vcl-xinerama-clone-fix.diff, n#578730, thorsten
+
+[ Toolbars ]
+SectionOwner => cbosdo
+
+toolbar-decorations-fix.diff
diff --git a/patches/dev300/toolbar-decorations-fix.diff b/patches/dev300/toolbar-decorations-fix.diff
index 32336fc..c0bb401 100644
--- a/patches/dev300/toolbar-decorations-fix.diff
+++ b/patches/dev300/toolbar-decorations-fix.diff
@@ -1241,24 +1241,6 @@ index 01f6824..4a0f77e 100644
return pWin;
}
-@@ -1474,9 +1569,16 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
- m_xFrame,
- SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ),
- &GetToolBox() );
-+
-+ pColorWin->EnableDocking(true);
-+ pColorWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pColorWin);
-+
-+#if 0
- pColorWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
-- pColorWin->StartSelection();
- SetPopupWindow( pColorWin );
-+#endif
-+ pColorWin->StartSelection();
-+
- return pColorWin;
- }
-
diff --git svx/source/tbxctrls/extrusioncontrols.src svx/source/tbxctrls/extrusioncontrols.src
index 3e391de..cd56231 100644
--- svx/source/tbxctrls/extrusioncontrols.src
@@ -1899,12 +1881,7 @@ index 94494aa..1eab739 100644
virtual Window* GetPreferredKeyInputWindow();
virtual void GetFocus();
virtual void DataChanged( const DataChangedEvent& rDCEvt );
-@@ -832,10 +836,11 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
- const String& rWndTitle,
- Window* pParentWindow ) :
-
-- SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL ) ),
-+ SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
+@@ -832,6 +836,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
theSlotId( nSlotId ),
aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
@@ -1921,7 +1898,7 @@ index 94494aa..1eab739 100644
if ( pDocSh )
if ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) )
pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
-@@ -907,16 +914,31 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
+@@ -907,12 +914,24 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
aColorSet.SetLineCount( PALETTE_Y );
lcl_CalcSizeValueSet( *this, aColorSet, aSize12 );
@@ -1946,13 +1923,6 @@ index 94494aa..1eab739 100644
AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
if ( bKillTable )
- delete pColorTable;
-+
-+ WinBits nBits = GetStyle();
-+ SetStyle( nBits & ~WB_MOVEABLE );
- }
-
- SvxColorWindow_Impl::~SvxColorWindow_Impl()
@@ -945,8 +967,8 @@ IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
while in Dispatch()), accessing members will crash in this case. */
aColorSet.SetNoSelection();
@@ -1964,20 +1934,18 @@ index 94494aa..1eab739 100644
if ( !nItemId && ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId ) )
{
-@@ -1058,11 +1080,17 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
-
+@@ -1058,13 +1080,16 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
-- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
-+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
+ aLabel( this, WinBits( ) ),
aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
bParagraphMode(sal_False)
{
-+ WinBits nBits = GetStyle();
-+ SetStyle( nBits & ~WB_MOVEABLE );
-+
+ WinBits nBits = GetStyle();
+ SetStyle( nBits & ~WB_MOVEABLE );
+
+ SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor( ) );
+
BindListener();
@@ -2029,33 +1997,29 @@ index 94494aa..1eab739 100644
Any a;
Sequence< PropertyValue > aArgs( 2 );
-@@ -1332,10 +1377,16 @@ BOOL SvxFrameWindow_Impl::Close()
+@@ -1332,7 +1377,8 @@ BOOL SvxFrameWindow_Impl::Close()
- SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
-- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
-+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_DIALOGCONTROL | WB_SYSTEMWINDOW ) ),
-
-- aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) )
+- aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) )
+ aLineSet( this, WinBits( WB_3DLOOK | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD | WB_NO_DIRECTSELECT ) ),
+ aLabel( this, WinBits( ) )
{
-+ WinBits nBits = GetStyle();
-+ SetStyle( nBits & ~WB_MOVEABLE );
-+
-+ SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor( ) );
-+
- try
- {
- Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW );
-@@ -1344,6 +1395,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
+ WinBits nBits = GetStyle();
+ SetStyle( nBits & ~WB_MOVEABLE );
+@@ -1344,12 +1353,6 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
catch(const uno::Exception& )
{
}
-+
+-
+- FixedText aLabel( this, WinBits( WB_NOMULTILINE ) );
+- aLabel.SetText( SVX_RESSTR( RID_SVXSTR_FRAME_STYLE ) );
+- Size aTxtSize( 100, 15 );
+- aLabel.SetSizePixel( aTxtSize );
+- aLabel.SetPosPixel( Point( 3, 3 ) );
+
Size aBmpSize( 55, 12 );
CreateBitmaps();
-
@@ -1352,10 +1404,22 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r
aLineSet.SetText( SVX_RESSTR(STR_NONE) );
@@ -2118,20 +2082,7 @@ index 94494aa..1eab739 100644
return pColorWin;
}
-@@ -2422,10 +2493,9 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
- SVX_RESSTR(nResId),
- &GetToolBox() );
-
-- pColorWin->StartPopupMode( &GetToolBox(),
-- FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
-+ pColorWin->EnableDocking( true );
-+ pColorWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pColorWin);
- pColorWin->StartSelection();
-- SetPopupWindow( pColorWin );
- return pColorWin;
- }
-
-@@ -2496,16 +2566,15 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow()
+@@ -2496,7 +2566,7 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow()
m_aCommandURL,
GetSlotId(),
m_xFrame,
@@ -2140,41 +2091,6 @@ index 94494aa..1eab739 100644
&GetToolBox() );
if ( GetSlotId() == SID_ATTR_CHAR_COLOR_BACKGROUND )
- pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND ) );
-
-- pColorWin->StartPopupMode( &GetToolBox(),
-- FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF );
-+ pColorWin->EnableDocking( true );
-+ pColorWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pColorWin);
- pColorWin->StartSelection();
-- SetPopupWindow( pColorWin );
- return pColorWin;
- }
-
-@@ -2591,9 +2660,9 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
- SvxFrameWindow_Impl* pFrameWin = new SvxFrameWindow_Impl(
- GetSlotId(), m_xFrame, &GetToolBox() );
-
-- pFrameWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS | FLOATWIN_POPUPMODE_ALLOWTEAROFF );
-+ pFrameWin->EnableDocking( true );
-+ pFrameWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pFrameWin);
- pFrameWin->StartSelection();
-- SetPopupWindow( pFrameWin );
-
- return pFrameWin;
- }
-@@ -2640,9 +2709,9 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
- SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
- {
- SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() );
-- pLineWin->StartPopupMode( &GetToolBox(), TRUE );
-+ pLineWin->EnableDocking( true );
-+ pLineWin->GetDockingManager()->StartPopupMode(&GetToolBox(),pLineWin);
- pLineWin->StartSelection();
-- SetPopupWindow( pLineWin );
-
- return pLineWin;
- }
@@ -2703,10 +2772,9 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
SVX_RESSTR(RID_SVXSTR_FRAME_COLOR),
&GetToolBox() );
@@ -2271,40 +2187,6 @@ index 6d70c20..5c98a3b 100644
}
Point ImplPopupFloatWin::GetToolboxPosition() const
-@@ -650,19 +664,22 @@ void ImplPopupFloatWin::DrawGrip()
- aRect.nLeft+=3;
- aRect.nRight-=3;
-
-- if( mbHighlight )
-- {
-- Erase( aRect );
-- DrawSelectionBackground( aRect, 2, FALSE, TRUE, FALSE );
-- }
-- else
-- {
-- SetFillColor( GetSettings().GetStyleSettings().GetFaceColor() );
-- SetLineColor();
-- DrawRect( aRect );
-+ bool bMoveable = ( mpDockingWin->GetFloatStyle() & WB_MOVEABLE) > 0;
-+ if ( bMoveable ) {
-+ if( mbHighlight )
-+ {
-+ Erase( aRect );
-+ DrawSelectionBackground( aRect, 2, FALSE, TRUE, FALSE );
-+ }
-+ else
-+ {
-+ SetFillColor( GetSettings().GetStyleSettings().GetFaceColor() );
-+ SetLineColor();
-+ DrawRect( aRect );
-+ }
- }
-
-- if( !ToolBox::AlwaysLocked() ) // no grip if toolboxes are locked
-+ if( bMoveable && !ToolBox::AlwaysLocked() ) // no grip if toolboxes are locked
- {
- #ifdef TEAROFF_DASHED
- // draw single dashed line
@@ -733,8 +750,7 @@ void ImplPopupFloatWin::Paint( const Rectangle& )
void ImplPopupFloatWin::MouseMove( const MouseEvent& rMEvt )
{
commit b573895c33e6e19dc3327d7d7b017cd19325217d
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Feb 17 10:14:31 2010 +0100
Default to ooo320-m12.
* configure.in: ooo320-m12
diff --git a/configure.in b/configure.in
index 11d3a02..475bdf1 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=ooo320-m8
+DEFAULT_TAG=ooo320-m12
# For the upstream packages it is like:
# DEFAULT_TAG=OOO320_m1
More information about the ooo-build-commit
mailing list