[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 19 commits - bridges/source cui/source officecfg/registry sal/inc sc/sdi sc/source sd/sdi sd/source svx/inc svx/sdi svx/source sw/inc sw/sdi sw/source vcl/aqua vcl/source
Armin Le Grand
alg at apache.org
Wed Apr 17 16:33:32 PDT 2013
bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 3
cui/source/tabpages/tplnedef.cxx | 17
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 15
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 81 +++-
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 10
sal/inc/sal/types.h | 2
sc/sdi/drawsh.sdi | 4
sc/sdi/scalc.sdi | 14
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 1
sd/sdi/drtxtob.sdi | 8
sd/source/ui/view/drtxtob1.cxx | 2
svx/inc/svx/dialogs.hrc | 1
svx/inc/svx/dlgctrl.hxx | 22 -
svx/inc/svx/svdundo.hxx | 20 +
svx/inc/svx/svxids.hrc | 2
svx/sdi/svx.sdi | 193 ++--------
svx/source/dialog/dlgctrl.cxx | 35 +
svx/source/sidebar/line/LinePropertyPanel.cxx | 17
svx/source/sidebar/line/LinePropertyPanel.hrc | 1
svx/source/sidebar/line/LinePropertyPanel.src | 4
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 53 --
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 3
svx/source/sidebar/paragraph/ParaPropertyPanel.src | 14
svx/source/sidebar/text/TextPropertyPanel.cxx | 30 -
svx/source/sidebar/text/TextPropertyPanel.hxx | 2
svx/source/sidebar/text/TextPropertyPanel.src | 2
svx/source/tbxctrls/SvxColorValueSet.cxx | 3
sw/inc/cmdid.h | 7
sw/sdi/_frmsh.sdi | 2
sw/sdi/_grfsh.sdi | 2
sw/sdi/drawsh.sdi | 4
sw/sdi/swriter.sdi | 40 --
sw/source/ui/shells/frmsh.cxx | 4
sw/source/ui/shells/grfsh.cxx | 4
vcl/aqua/source/a11y/aqua11yfocuslistener.cxx | 2
vcl/aqua/source/a11y/aqua11yfocuslistener.hxx | 9
vcl/aqua/source/app/salinst.cxx | 2
vcl/aqua/source/app/vclnsapp.mm | 4
vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 20 -
vcl/aqua/source/gdi/aquaprintview.mm | 2
vcl/aqua/source/gdi/salbmp.cxx | 4
vcl/aqua/source/gdi/salgdiutils.cxx | 2
vcl/aqua/source/gdi/salprn.cxx | 2
vcl/aqua/source/gdi/salvd.cxx | 2
vcl/aqua/source/window/salframe.cxx | 14
vcl/aqua/source/window/salframeview.mm | 6
vcl/aqua/source/window/salnsmenu.mm | 16
vcl/aqua/source/window/salobj.cxx | 6
vcl/source/app/settings.cxx | 10
53 files changed, 349 insertions(+), 382 deletions(-)
New commits:
commit 6c248d4f4f3a6e432e140900e5735e249e27dd01
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 14:33:38 2013 +0000
122072 map SID_ATTR_LINE_START and SID_ATTR_LINE_END to the correct GetState method GetDrawAttrState
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 77e893e..7f784c7 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -36,14 +36,14 @@ interface TextDraw : TextDrawBase
SID_ATTR_LINE_START
[
ExecMethod = ExecDrawAttrArgs ;
- StateMethod = DisableState ;
+ StateMethod = GetDrawAttrState ;
Export = FALSE;
]
SID_ATTR_LINE_END
[
ExecMethod = ExecDrawAttrArgs ;
- StateMethod = DisableState ;
+ StateMethod = GetDrawAttrState ;
Export = FALSE;
]
commit e9b32f693643ae28d60922e344d908082f15c510
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 14:15:54 2013 +0000
122072 map SID_ATTR_LINE_START and SID_ATTR_LINE_END to the correct GetState method GetDrawAttrState
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index 7bb3fa4..09c0333 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -86,8 +86,8 @@ interface TableDraw
// ---- Linien-Attribute:
SID_ATTR_LINE_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINEEND_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_LINE_START [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
- SID_ATTR_LINE_END [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_LINE_START [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_LINE_END [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINE_DASH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINE_WIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINE_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
commit 0bef7cb68127ab4ff81cc80bc3f7274adf87f5ac
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 17 14:08:30 2013 +0000
122025: followup - remove usage of removed Slot
diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi
index bf16a82..9835234 100644
--- a/sd/sdi/drtxtob.sdi
+++ b/sd/sdi/drtxtob.sdi
@@ -189,14 +189,6 @@ shell TextObjectBar
ExecMethod = Execute ;
StateMethod = GetAttrState;
]
- SID_ATTR_PARA_RIGHT
- [
- ExecMethod = Execute ;
- ]
- SID_ATTR_PARA_LEFT
- [
- ExecMethod = Execute ;
- ]
SID_OUTLINE_LEFT // ole : no, status : ?
[
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 275ceee..8366b5e 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -241,7 +241,6 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_OUTLINE_LEFT:
- case SID_ATTR_PARA_LEFT:
{
if (pOLV)
{
@@ -257,7 +256,6 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_OUTLINE_RIGHT:
- case SID_ATTR_PARA_RIGHT:
{
if (pOLV)
{
commit 55c850cfeb2d136554d611d3ac1f4195eff28bd0
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 13:53:21 2013 +0000
only check for gcc-visibility feature but not for gcc itself
there are non-gcc compilers such as clang that support this feature
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 944cf47..8f829d3 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -268,7 +268,7 @@ typedef void * sal_Handle;
# define SAL_DLLPUBLIC_EXPORT __global
# define SAL_DLLPUBLIC_IMPORT
# define SAL_DLLPRIVATE __hidden
-# elif defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE)
+# elif defined(HAVE_GCC_VISIBILITY_FEATURE)
# define SAL_DLLPUBLIC_EXPORT __attribute__ ((visibility("default")))
# define SAL_DLLPUBLIC_IMPORT
# define SAL_DLLPRIVATE __attribute__ ((visibility("hidden")))
commit 2f35d17889b1eafe670262a82b95ee04e165d9df
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 12:32:55 2013 +0000
avoid problems with C++ initializer lists (N2672) in our Aqua code
when the provided type and the target type of an initializer list don't match
the new behaviour described in C++11's N2672 proposal can be triggered. Though
that is very useful in general it complicates things for our case so that we're
better of to use the little helpers provided by XCode's CF framework.
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 9ba2bb0..c47479a 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -1326,7 +1326,7 @@ NSImage* CreateNSImage( const Image& rImage )
NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
CGContextRef rCGContext = reinterpret_cast<CGContextRef>([pContext graphicsPort]);
- const CGRect aDstRect = { {0, 0}, { aSize.Width(), aSize.Height() } };
+ const CGRect aDstRect = CGRectMake( 0, 0, aSize.Width(), aSize.Height());
CGContextDrawImage( rCGContext, aDstRect, xImage );
[pImage unlockFocus];
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 7c2b268..660388a 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -805,7 +805,7 @@ static void addBool( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
ControlTarget* pCtrlTarget
)
{
- NSRect aCheckRect = { { rCurX + nAttachOffset, 0 }, { 0, 15 } };
+ NSRect aCheckRect = NSMakeRect( rCurX + nAttachOffset, 0, 0, 15);
NSButton* pBtn = [[NSButton alloc] initWithFrame: aCheckRect];
[pBtn setButtonType: NSSwitchButton];
[pBtn setState: bValue ? NSOnState : NSOffState];
@@ -874,7 +874,7 @@ static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttach
// setup radio matrix
NSButtonCell* pProto = [[NSButtonCell alloc] init];
- NSRect aRadioRect = { { rCurX + nOff, 0 }, { 280 - rCurX, 5*rChoices.getLength() } };
+ NSRect aRadioRect = NSMakeRect( rCurX + nOff, 0, 280 - rCurX, 5*rChoices.getLength());
[pProto setTitle: @"RadioButtonGroup"];
[pProto setButtonType: NSRadioButton];
NSMatrix* pMatrix = [[NSMatrix alloc] initWithFrame: aRadioRect
@@ -932,7 +932,7 @@ static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttac
aTextRect.origin.x = rCurX /* + nAttachOffset*/;
// don't indent attached lists, looks bad in the existing cases
- NSRect aBtnRect = { { rCurX /*+ nAttachOffset*/ + aTextRect.size.width, 0 }, { 0, 15 } };
+ NSRect aBtnRect = NSMakeRect( rCurX /*+ nAttachOffset*/ + aTextRect.size.width, 0, 0, 15);
NSPopUpButton* pBtn = [[NSPopUpButton alloc] initWithFrame: aBtnRect pullsDown: NO];
// iterate options
@@ -1008,7 +1008,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
nOff = aTextRect.size.width + 5;
}
- NSRect aFieldRect = { { rCurX + nOff + nAttachOffset, 0 }, { 100, 25 } };
+ NSRect aFieldRect = NSMakeRect( rCurX + nOff + nAttachOffset, 0, 100, 25);
NSTextField* pFieldView = [[NSTextField alloc] initWithFrame: aFieldRect];
[pFieldView setEditable: YES];
[pFieldView setSelectable: YES];
@@ -1032,9 +1032,9 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
if( rCtrlType.equalsAscii( "Range" ) )
{
// add a stepper control
- NSRect aStepFrame = { { aFieldRect.origin.x + aFieldRect.size.width + 5,
- aFieldRect.origin.y },
- { 15, aFieldRect.size.height } };
+ NSRect aStepFrame = NSMakeRect(
+ aFieldRect.origin.x + aFieldRect.size.width + 5, aFieldRect.origin.y,
+ 15, aFieldRect.size.height);
NSStepper* pStep = [[NSStepper alloc] initWithFrame: aStepFrame];
[pStep setIncrement: 1];
[pStep setValueWraps: NO];
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm
index 7e94f13..12a3513 100644
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/aqua/source/gdi/aquaprintview.mm
@@ -55,7 +55,7 @@
// #i101108# sanity check
if( nWidth < 1 )
nWidth = 1;
- NSRect aRect = { { page % nWidth, page / nWidth }, aPaperSize };
+ NSRect aRect = { NSMakePoint( page % nWidth, page / nWidth), aPaperSize };
return aRect;
}
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 82ba6b2..7020537 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -96,7 +96,7 @@ bool AquaSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits,
CreateContext();
// copy layer content into the bitmap buffer
- const CGPoint aSrcPoint = { -nX, -nY };
+ const CGPoint aSrcPoint = CGPointMake( -nX, -nY);
::CGContextDrawLayerAtPoint( mxGraphicContext, aSrcPoint, xLayer );
return true;
}
@@ -731,7 +731,7 @@ CGImageRef AquaSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, int
else
{
nY = mnHeight - (nY + nNewHeight); // adjust for y-mirrored context
- const CGRect aCropRect = {{nX, nY}, {nNewWidth, nNewHeight}};
+ const CGRect aCropRect = CGRectMake( nX, nY, nNewWidth, nNewHeight);
xCroppedImage = CGImageCreateWithImageInRect( mxCachedImage, aCropRect );
}
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index dd49d6f..3011ffa 100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -197,7 +197,7 @@ bool AquaSalGraphics::CheckContext()
if( !mrContext )
{
- const CGSize aLayerSize = {nWidth,nHeight};
+ const CGSize aLayerSize = CGSizeMake( nWidth, nHeight);
NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getWindow()];
CGContextRef xCGContext = reinterpret_cast<CGContextRef>([pNSGContext graphicsPort]);
mxLayer = CGLayerCreateWithContext( xCGContext, aLayerSize, NULL );
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index cabf4a8..0a652c6 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -242,7 +242,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio
}
else if( i_nWidth > 0 && i_nHeight > 0 )
{
- NSSize aPaperSize = { TenMuToPt(i_nWidth), TenMuToPt(i_nHeight) };
+ NSSize aPaperSize = NSMakeSize( TenMuToPt(i_nWidth), TenMuToPt(i_nHeight));
[mpPrintInfo setPaperSize: aPaperSize];
}
// this seems counterintuitive
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index abfb902..819154e 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -228,7 +228,7 @@ sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
DBG_ASSERT( xCGContext, "no context" );
- const CGSize aNewSize = { nDX, nDY };
+ const CGSize aNewSize = CGSizeMake( nDX, nDY);
mxLayer = CGLayerCreateWithContext( xCGContext, aNewSize, NULL );
if( mxLayer && mpGraphics )
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index fede755..4056d57 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -209,7 +209,7 @@ void AquaSalFrame::initWindowAndView()
[mpWindow setHasShadow: YES];
[mpWindow setDelegate: mpWindow];
- NSRect aRect = { { 0,0 }, { maGeometry.nWidth, maGeometry.nHeight } };
+ const NSRect aRect = NSMakeRect( 0,0, maGeometry.nWidth, maGeometry.nHeight );
mnTrackingRectTag = [mpView addTrackingRect: aRect owner: mpView userData: nil assumeInside: NO];
maSysData.pView = mpView;
@@ -500,7 +500,7 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
nWidth += maGeometry.nLeftDecoration + maGeometry.nRightDecoration;
nHeight += maGeometry.nTopDecoration + maGeometry.nBottomDecoration;
- NSSize aSize = { nWidth, nHeight };
+ const NSSize aSize = NSMakeSize( nWidth, nHeight);
// Size of full window (content+structure) although we only
// have the client size in arguments
@@ -529,7 +529,7 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
if (nWidth>32767) nWidth=32767;
if (nHeight>32767) nHeight=32767;
- NSSize aSize = { nWidth, nHeight };
+ const NSSize aSize = NSMakeSize( nWidth, nHeight);
// Size of full window (content+structure) although we only
// have the client size in arguments
@@ -546,7 +546,7 @@ void AquaSalFrame::SetClientSize( long nWidth, long nHeight )
if( mpWindow )
{
- NSSize aSize = { nWidth, nHeight };
+ const NSSize aSize = NSMakeSize( nWidth, nHeight);
[mpWindow setContentSize: aSize];
UpdateFrameGeometry();
@@ -956,7 +956,7 @@ void AquaSalFrame::SetPointerPos( long nX, long nY )
// FIXME: use Cocoa functions
// FIXME: multiscreen support
- CGPoint aPoint = { nX + maGeometry.nX, nY + maGeometry.nY };
+ const CGPoint aPoint = CGPointMake( nX + maGeometry.nX, nY + maGeometry.nY);
CGDirectDisplayID mainDisplayID = CGMainDisplayID();
CGDisplayMoveCursorToPoint( mainDisplayID, aPoint );
}
@@ -993,7 +993,7 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
- NSRect aNSRect = { {rRect.Left(), rRect.Top()}, { rRect.GetWidth(), rRect.GetHeight() } };
+ NSRect aNSRect = NSMakeRect( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight());
VCLToCocoa( aNSRect, false );
[mpView setNeedsDisplayInRect: aNSRect];
@@ -1755,7 +1755,7 @@ void AquaSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
if( nWidth && nHeight )
{
- NSRect aRect = { { nX, nY }, { nWidth, nHeight } };
+ NSRect aRect = NSMakeRect( nX, nY, nWidth, nHeight);
VCLToCocoa( aRect, false );
maClippingRects.push_back( CGRectMake(aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height) );
}
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index c07790d..cb22309 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -156,8 +156,8 @@ static AquaSalFrame* getMouseContainerFrame()
{
mDraggingDestinationHandler = nil;
mpFrame = pFrame;
- NSRect aRect = { { pFrame->maGeometry.nX, pFrame->maGeometry.nY },
- { pFrame->maGeometry.nWidth, pFrame->maGeometry.nHeight } };
+ NSRect aRect = NSMakeRect( pFrame->maGeometry.nX, pFrame->maGeometry.nY,
+ pFrame->maGeometry.nWidth, pFrame->maGeometry.nHeight);
pFrame->VCLToCocoa( aRect );
NSWindow* pNSWindow = [super initWithContentRect: aRect styleMask: mpFrame->getStyleMask() backing: NSBackingStoreBuffered defer: NO ];
[pNSWindow useOptimizedDrawing: YES]; // OSX recommendation when there are no overlapping subviews within the receiver
@@ -462,7 +462,7 @@ static AquaSalFrame* getMouseContainerFrame()
if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
{
// FIXME: does this leak the returned NSCursor of getCurrentCursor ?
- NSRect aRect = { { 0, 0 }, { mpFrame->maGeometry.nWidth, mpFrame->maGeometry.nHeight } };
+ const NSRect aRect = NSMakeRect( 0, 0, mpFrame->maGeometry.nWidth, mpFrame->maGeometry.nHeight);
[self addCursorRect: aRect cursor: mpFrame->getCurrentCursor()];
}
}
diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm
index cf3bb4e..154e9ea 100644
--- a/vcl/aqua/source/window/salnsmenu.mm
+++ b/vcl/aqua/source/window/salnsmenu.mm
@@ -137,9 +137,8 @@
NSRect aImgRect = { { 2, 0 }, { 0, 0 } };
for( size_t i = 0; i < rButtons.size(); ++i )
{
- NSRect aFromRect = { { 0, 0 },
- { rButtons[i].maButton.maImage.GetSizePixel().Width(),
- rButtons[i].maButton.maImage.GetSizePixel().Height() } };
+ const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
+ const NSRect aFromRect = NSMakeRect( 0, 0, aPixSize.Width(), aPixSize.Height());
aImgRect.origin.y = floor((aFrame.size.height - aFromRect.size.height)/2);
aImgRect.size = aFromRect.size;
if( rButtons[i].mpNSImage )
@@ -161,9 +160,8 @@
NSPoint aMousePt = [pEvent locationInWindow];
for( size_t i = 0; i < rButtons.size(); ++i )
{
- NSRect aFromRect = { { 0, 0 },
- { rButtons[i].maButton.maImage.GetSizePixel().Width(),
- rButtons[i].maButton.maImage.GetSizePixel().Height() } };
+ const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
+ const NSRect aFromRect = NSMakeRect( 0, 0, aPixSize.Width(), aPixSize.Height());
aImgRect.origin.y = (aFrame.size.height - aFromRect.size.height)/2;
aImgRect.size = aFromRect.size;
if( aMousePt.x >= aImgRect.origin.x && aMousePt.x <= (aImgRect.origin.x+aImgRect.size.width) &&
@@ -195,9 +193,9 @@
aSize.width = 2;
for( size_t i = 0; i < rButtons.size(); ++i )
{
- NSRect aImgRect = { { aSize.width, floor((aSize.height-rButtons[i].maButton.maImage.GetSizePixel().Height())/2) },
- { rButtons[i].maButton.maImage.GetSizePixel().Width(),
- rButtons[i].maButton.maImage.GetSizePixel().Height() } };
+ const Size aPixSize = rButtons[i].maButton.maImage.GetSizePixel();
+ const int nY = floor( aSize.height - aPixSize.Height() ) / 2;
+ NSRect aImgRect = NSMakeRect( aSize.width, nY, aPixSize.Width(), aPixSize.Height());
if( rButtons[i].mpToolTipString )
[self addToolTipRect: aImgRect owner: rButtons[i].mpToolTipString userData: NULL];
aSize.width += 2 + aImgRect.size.width;
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 9b9c27a..d8b053a 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -168,15 +168,15 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
void AquaSalObject::setClippedPosSize()
{
- NSRect aViewRect = { { 0, 0 }, { mnWidth, mnHeight } };
+ NSRect aViewRect = NSMakeRect( 0, 0, mnWidth, mnHeight);
if( maSysData.pView )
{
NSView *pView = maSysData.pView;
[pView setFrame: aViewRect];
}
- NSRect aClipViewRect = { { mnX, mnY }, { mnWidth, mnHeight } };
- NSPoint aClipPt = { 0, 0 };
+ NSRect aClipViewRect = NSMakeRect( mnX, mnY, mnWidth, mnHeight);
+ NSPoint aClipPt = NSMakePoint( 0, 0);
if( mbClip )
{
aClipViewRect.origin.x += mnClipX;
commit 6b722f7d7c1ae5a1b344a24442bd591afba8606b
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 12:15:11 2013 +0000
i122041 Added 'Automatic' to TextPropertyPanel FontColor and HilightColor, added 'No Color' to ParagraphPropertyPanel BackgroundColor
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index d95bc55..270cf2f 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -374,6 +374,7 @@
#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 320)
#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 321)
#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 322)
+#define RID_POPUPPANEL_PARAPAGE_BACK_COLOR (RID_SVX_START + 323)
// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 8c0811f..6b73ada 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -87,11 +87,6 @@ namespace {
return bFound ? n : -1;
}
- Color GetTransparentColor (void)
- {
- return COL_TRANSPARENT;
- }
-
void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList& rList)
{
const sal_uInt32 nCount(rList.Count());
@@ -916,10 +911,16 @@ IMPL_LINK( LinePropertyPanel, ChangeTransparentHdl, void *, EMPTYARG )
-PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParent)
+namespace
{
- const ResId aResId(SVX_RES(STR_AUTOMATICE));
+ Color GetTransparentColor (void)
+ {
+ return COL_TRANSPARENT;
+ }
+} // end of anonymous namespace
+PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParent)
+{
return new ColorControl(
pParent,
mpBindings,
@@ -928,7 +929,7 @@ PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParen
::boost::bind(GetTransparentColor),
::boost::bind(&LinePropertyPanel::SetColor, this, _1, _2),
pParent,
- &aResId);
+ 0);
}
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index e552016..8f6d08d 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -71,7 +71,6 @@
//color popup page
#define VS_COLOR 1
-#define STR_AUTOMATICE 2
//style popup page
#define VS_STYLE 1
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index e4f6fde..6d52cb2 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -326,10 +326,6 @@ Control RID_POPUPPANEL_LINEPAGE_COLOR
TabStop = TRUE ;
Text = "Color";
};
- String STR_AUTOMATICE
- {
- Text [ en-US ] = "No Color";
- };
};
Control RID_POPUPPANEL_LINEPAGE_STYLE
{
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 5bf99d2..1580ded 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -767,11 +767,6 @@ void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 /* nSID */, SfxItemState
}
}
-Color ParaPropertyPanel::GetBGColor (void) const
-{
- return maColor;
-}
-
void ParaPropertyPanel::SetBGColor (
const String& /* rsColorName */,
const Color aColor)
@@ -1538,17 +1533,27 @@ PopupControl* ParaPropertyPanel::CreateNumberingPopupControl (PopupContainer* pP
return new ParaNumberingControl(pParent, *this);
}
+namespace
+{
+ Color GetNoBackgroundColor(void)
+ {
+ return COL_TRANSPARENT;
+ }
+} // end of anonymous namespace
+
PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pParent)
{
+ const ResId aResId(SVX_RES(STR_NOFILL));
+
return new ColorControl(
pParent,
mpBindings,
- SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
+ SVX_RES(RID_POPUPPANEL_PARAPAGE_BACK_COLOR),
SVX_RES(VS_FONT_COLOR),
- ::boost::bind(&ParaPropertyPanel::GetBGColor, this),
+ ::boost::bind(GetNoBackgroundColor),
::boost::bind(&ParaPropertyPanel::SetBGColor, this, _1,_2),
pParent,
- 0);
+ &aResId);
}
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 4bc846f..7317dbb 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -278,7 +278,6 @@ private:
void InitToolBoxSpacing();
void InitToolBoxLineSpacing();
- Color GetBGColor (void) const;
void SetBGColor (const String& rsColorName, const Color aColor);
};
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 926e3a6..14730c4 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -557,31 +557,27 @@ Control RID_SIDEBAR_PARA_PANEL
};
//===========================================Back color page==============================
-/*
Control RID_POPUPPANEL_PARAPAGE_BACK_COLOR
{
OutputSize = TRUE;
DialogControl = TRUE;
Border = FALSE;
-
- Size = MAP_APPFONT( POPUP_COLOR_PICKER_WIDTH + POPUP_BORDER_WIDTH , POPUP_COLOR_PICKER_HEIGHT +POPUP_BORDER_HEIGHT );
+ Size = MAP_APPFONT( POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT );
Control VS_FONT_COLOR
{
HelpID = HID_PPROPERTYPANEL_PARA_BACK_COLOR_VS ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
- Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT );
+ Hide = TRUE ;
+ Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
+ Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2);
TabStop = TRUE ;
Text = "Color Picker";
};
-
String STR_NOFILL
{
Text [ en-US ] = "No Color";
};
-
-};*/
+};
//===========================================Bullet popup page==============================
Control RID_POPUPPANEL_PARAPAGE_BULLETS
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 1b82e86..ba4c5fc 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -96,30 +96,42 @@ PopupControl* TextPropertyPanel::CreateUnderlinePopupControl (PopupContainer* pP
return new TextUnderlineControl(pParent, *this);
}
+namespace
+{
+ Color GetAutomaticColor(void)
+ {
+ return COL_AUTO;
+ }
+} // end of anonymous namespace
+
PopupControl* TextPropertyPanel::CreateFontColorPopupControl (PopupContainer* pParent)
{
+ const ResId aResId(SVX_RES(STR_AUTOMATICE));
+
return new ColorControl(
pParent,
mpBindings,
SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
SVX_RES(VS_FONT_COLOR),
- ::boost::bind(&TextPropertyPanel::GetFontColor, this),
+ ::boost::bind(GetAutomaticColor),
::boost::bind(&TextPropertyPanel::SetFontColor, this, _1,_2),
pParent,
- 0);
+ &aResId);
}
PopupControl* TextPropertyPanel::CreateBrushColorPopupControl (PopupContainer* pParent)
{
+ const ResId aResId(SVX_RES(STR_AUTOMATICE));
+
return new ColorControl(
pParent,
mpBindings,
SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
SVX_RES(VS_FONT_COLOR),
- ::boost::bind(&TextPropertyPanel::GetBrushColor, this),
+ ::boost::bind(GetAutomaticColor),
::boost::bind(&TextPropertyPanel::SetBrushColor, this, _1,_2),
pParent,
- 0);
+ &aResId);
}
long TextPropertyPanel::GetSelFontSize()
@@ -1550,11 +1562,6 @@ void TextPropertyPanel::UpdateFontScript()
}
}
-Color TextPropertyPanel::GetFontColor (void) const
-{
- return maColor;
-}
-
void TextPropertyPanel::SetFontColor (
const String& /* rsColorName */,
const Color aColor)
@@ -1564,11 +1571,6 @@ void TextPropertyPanel::SetFontColor (
maColor = aColor;
}
-Color TextPropertyPanel::GetBrushColor (void) const
-{
- return maBackColor;
-}
-
void TextPropertyPanel::SetBrushColor (
const String& /* rsColorName */,
const Color aColor)
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 05a9c88..1701ca7 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -69,9 +69,7 @@ public:
void SetSpacing(long nKern);
void EndSpacingPopupMode (void);
void EndUnderlinePopupMode (void);
- Color GetFontColor (void) const;
void SetFontColor (const String& rsColorName,const Color aColor);
- Color GetBrushColor (void) const;
void SetBrushColor (const String& rsColorName,const Color aColor);
void SetUnderline(FontUnderline eUnderline);
Color& GetUnderlineColor();
diff --git a/svx/source/sidebar/text/TextPropertyPanel.src b/svx/source/sidebar/text/TextPropertyPanel.src
index b492a90..cce8204 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/svx/source/sidebar/text/TextPropertyPanel.src
@@ -599,7 +599,6 @@ Control RID_POPUPPANEL_TEXTPAGE_FONT_COLOR
Control VS_FONT_COLOR
{
-// HelpID = HID_COLOR_VS ;
HelpID = HID_PPROPERTYPANEL_TEXT_COLOR_VS;
Hide = TRUE ;
Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
@@ -611,7 +610,6 @@ Control RID_POPUPPANEL_TEXTPAGE_FONT_COLOR
{
Text [ en-US ] = "Automatic";
};
-
};
Control RID_POPUPPANEL_TEXTPAGE_SPACING
commit fadba0701348ed1749cb7411fce487a6d9124b5c
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 12:10:19 2013 +0000
WaE: remove semicolon before objc method body
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 4ea558b..7c2b268 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -482,7 +482,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
return self;
}
--(void)triggered:(id)pSender;
+-(void)triggered:(id)pSender
{
if( [pSender isMemberOfClass: [NSPopUpButton class]] )
{
@@ -523,7 +523,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
mpController->updateEnableState();
}
--(void)triggeredNumeric:(id)pSender;
+-(void)triggeredNumeric:(id)pSender
{
if( [pSender isMemberOfClass: [NSTextField class]] )
{
@@ -1100,7 +1100,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
}
@implementation AquaPrintAccessoryView
-+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState;
++(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState
{
const Sequence< PropertyValue >& rOptions( pController->getUIOptions() );
if( rOptions.getLength() == 0 )
commit c19292d7740d0787408675d17f2a487df6f040b8
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 12:05:15 2013 +0000
WaE: extraneous parantheses -> replaced by simplification
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 6f6ec6d..35aceaf 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -398,10 +398,7 @@ sal_Bool KeyboardSettings::operator ==( const KeyboardSettings& rSet ) const
if ( mpData == rSet.mpData )
return sal_True;
- if ( (mpData->mnOptions == rSet.mpData->mnOptions) )
- return sal_True;
- else
- return sal_False;
+ return (mpData->mnOptions == rSet.mpData->mnOptions);
}
// =======================================================================
@@ -1381,10 +1378,7 @@ sal_Bool NotificationSettings::operator ==( const NotificationSettings& rSet ) c
if ( mpData == rSet.mpData )
return sal_True;
- if ( (mpData->mnOptions == rSet.mpData->mnOptions) )
- return sal_True;
- else
- return sal_False;
+ return (mpData->mnOptions == rSet.mpData->mnOptions);
}
// =======================================================================
commit e07b24084863c7da7341e2dcd992af517f0c3847
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 12:02:55 2013 +0000
fix clang build breakers in AquaA11FocusListener class
- a reference to a still incomplete AquaA11FocusListener was used
- method declarations inside the class must omit the class name qualifier
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index e2a275b..c8f2b02 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
-rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::theListener;
+static rtl::Reference< AquaA11yFocusListener > theListener;
//------------------------------------------------------------------------------
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index 8527b99..4534b2b 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -37,10 +37,8 @@ class AquaA11yFocusListener :
{
id m_focusedObject;
- static rtl::Reference< AquaA11yFocusListener > theListener;
-
- AquaA11yFocusListener::AquaA11yFocusListener();
- virtual AquaA11yFocusListener::~AquaA11yFocusListener() {};
+ explicit AquaA11yFocusListener();
+ virtual ~AquaA11yFocusListener() {};
public:
static rtl::Reference< AquaA11yFocusListener > get();
@@ -55,4 +53,5 @@ public:
virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
};
-#endif // _AQUA11YFOCUSLISTENER_HXX_
\ No newline at end of file
+#endif // _AQUA11YFOCUSLISTENER_HXX_
+
commit ba037c7d3d5b79c9a5fd96671a86403dcf573128
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 11:55:50 2013 +0000
allow Mac port running with completely inactive AppleRemote
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 0b61a58..c1e4090 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -450,7 +450,7 @@
{
(void)pNotification;
SalData* pSalData = GetSalData();
- if (pSalData->mpMainController->remoteControl)
+ if( pSalData->mpMainController && pSalData->mpMainController->remoteControl)
{
// [remoteControl startListening: self];
// does crash because the right thing to do is
@@ -476,7 +476,7 @@
{
(void)pNotification;
SalData* pSalData = GetSalData();
- if (pSalData->mpMainController->remoteControl)
+ if( pSalData->mpMainController && pSalData->mpMainController->remoteControl)
{
// [remoteControl stopListening: self];
// does crash because the right thing to do is
commit 339494cf948e22dcb089c0d921dfb396d9233cb8
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 17 11:50:36 2013 +0000
122025: - UNO commands introduced with sidebar: apply labels and disable them UI customization
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 3dfa108..96eb65b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -768,6 +768,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:NumberFormatType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Number Format Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:ObjectMirrorHorizontal" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Flip Object Horizontally</value>
@@ -1205,6 +1210,11 @@
<value xml:lang="en-US">Validity...</value>
</prop>
</node>
+ <node oor:name=".uno:ViewGridLines" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">View Grid lines</value>
+ </prop>
+ </node>
<node oor:name=".uno:ViewRowColumnHeaders" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Column & Row Headers</value>
@@ -1307,6 +1317,11 @@
<value xml:lang="en-US">Row</value>
</prop>
</node>
+ <node oor:name=".uno:SCDialogBorder" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Cell Borders</value>
+ </prop>
+ </node>
<node oor:name=".uno:SendTo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Send</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 2ca3d11..225c630 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1421,6 +1421,11 @@
<value>9</value>
</prop>
</node>
+ <node oor:name=".uno:CurrentBulletListType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Current Bullet List Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:CurrentDate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Current Date</value>
@@ -1431,6 +1436,11 @@
<value xml:lang="en-US">Current Language</value>
</prop>
</node>
+ <node oor:name=".uno:CurrentNumListType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Current Numbering List Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:CurrentTime" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Current Time</value>
@@ -1852,6 +1862,16 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:FillFloatTransparence" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Gradient Fill Transparency</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:FillTransparence" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fill Transparency</value>
+ </prop>
+ </node>
<node oor:name=".uno:FilterCrit" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Standard Filter...</value>
@@ -2121,14 +2141,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:FontDialog" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Character...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:FontHeight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Font Size</value>
@@ -3525,6 +3537,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:LineCap" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Line Cap Style</value>
+ </prop>
+ </node>
<node oor:name=".uno:LineDash" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Dash/Dot</value>
@@ -3538,6 +3555,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:LineJoint" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Line Corner Style</value>
+ </prop>
+ </node>
<node oor:name=".uno:LineStyle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Style</value>
@@ -3546,6 +3568,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:LineTransparence" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Line Transparency</value>
+ </prop>
+ </node>
<node oor:name=".uno:LineWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Width</value>
@@ -5120,6 +5147,16 @@
<value>9</value>
</prop>
</node>
+ <node oor:name=".uno:SvxFlipHorizontal" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Flip Horizontally</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SvxFlipVertical" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Flip Vertically</value>
+ </prop>
+ </node>
<node oor:name=".uno:SwEditOptions" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Text Document Options</value>
@@ -5461,6 +5498,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:TransAngle" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotation Angle</value>
+ </prop>
+ </node>
<node oor:name=".uno:TransformDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Position and Size...</value>
@@ -5469,6 +5511,16 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:TransRotX" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotation Pivot Point X</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:TransRotY" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotation Pivot Point Y</value>
+ </prop>
+ </node>
<node oor:name=".uno:TwainSelect" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Select Source...</value>
@@ -5781,6 +5833,19 @@
<value xml:lang="en-US">Flip</value>
</prop>
</node>
+ <node oor:name=".uno:FontDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Character...</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:FontDialogEff" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Character Font Effects...</value>
+ </prop>
+ </node>
<node oor:name=".uno:FormatMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">F~ormat</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 423ac13..bee0941 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -835,7 +835,7 @@
<value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
- <value>.uno:ObjectWrapDialog</value>
+ <value>.uno:TextWrap</value>
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 1f29df4..eceafc3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1551,6 +1551,11 @@
<value xml:lang="en-US">Backspace</value>
</prop>
</node>
+ <node oor:name=".uno:SwPageColumnType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Column Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:TableBoundaries" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Table Boundaries</value>
@@ -1773,6 +1778,11 @@
<value xml:lang="en-US">Indexes and Tables</value>
</prop>
</node>
+ <node oor:name=".uno:PageSettingDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Settings - Paper format</value>
+ </prop>
+ </node>
<node oor:name=".uno:SelectionModeMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Selection Mode</value>
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 853ad6c..9d04eaf 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -7823,7 +7823,7 @@ SfxVoidItem SetTabBgColor FID_TAB_MENU_SET_TAB_BG_COLOR
]
//--------------------------------------------------------------------------
-SfxBoolItem ViewOption SID_SCGRIDSHOW
+SfxBoolItem ViewGridLines SID_SCGRIDSHOW
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -7840,15 +7840,15 @@ SfxBoolItem ViewOption SID_SCGRIDSHOW
Readonly = FALSE,
/* config */
- AccelConfig = FALSE, //TRUE
+ AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE, //FALSE
- GroupId = GID_DATA;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
]
//--------------------------------------------------------------------------
-SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT
+SfxUInt16Item NumberFormatType SID_NUMBER_TYPE_FORMAT
[
/* flags: */
AutoUpdate = FALSE,
@@ -7869,6 +7869,6 @@ SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index a864e41..fdc4535 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -1276,8 +1276,6 @@
#define SID_CELL_FORMAT_BORDER (SID_SVX_START+1113)
#define SID_CHAR_DLG_EFFECT (SID_SVX_START+1114)
-#define SID_ATTR_PARA_LEFT (SID_SVX_START + 1115)
-#define SID_ATTR_PARA_RIGHT (SID_SVX_START + 1116)
#define FN_SVX_SET_NUMBER (SID_SVX_START + 1117)
#define FN_SVX_SET_BULLET (SID_SVX_START + 1118)
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 20b0952..482efeb 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3900,10 +3900,10 @@ SfxVoidItem FontDialogEff SID_CHAR_DLG_EFFECT
Asynchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -4312,55 +4312,6 @@ XFormTextStyleItem FontWorkTextStyle SID_FORMTEXT_STYLE
GroupId = GID_SPECIAL;
]
-SvxLRSpaceItem ParaOutlineLeft SID_ATTR_PARA_LEFT
-
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SvxLRSpaceItem ParaOutlineRight SID_ATTR_PARA_RIGHT
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
//--------------------------------------------------------------------------
SfxVoidItem FormatArea SID_ATTRIBUTES_AREA
()
@@ -6403,7 +6354,7 @@ SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON
GroupId = GID_ENUMERATION;
]
-SfxBoolItem CurrentBulNumRule FN_BUL_NUM_RULE_INDEX
+SfxBoolItem CurrentBulletListType FN_BUL_NUM_RULE_INDEX
(SfxUInt16Item On FN_PARAM_1)
[
/* flags: */
@@ -6425,13 +6376,13 @@ SfxBoolItem CurrentBulNumRule FN_BUL_NUM_RULE_INDEX
SlotType = SfxBoolItem
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_ENUMERATION;
]
-SfxBoolItem CurrentNumNumRule FN_NUM_NUM_RULE_INDEX
+SfxBoolItem CurrentNumListType FN_NUM_NUM_RULE_INDEX
(SfxUInt16Item On FN_PARAM_1)
[
/* flags: */
@@ -6453,10 +6404,10 @@ SfxBoolItem CurrentNumNumRule FN_NUM_NUM_RULE_INDEX
SlotType = SfxBoolItem
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_ENUMERATION;
]
@@ -15332,10 +15283,10 @@ SfxUInt16Item FillTransparence SID_ATTR_FILL_TRANSPARENCE
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15386,10 +15337,10 @@ SfxUInt16Item LineTransparence SID_ATTR_LINE_TRANSPARENCE
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15416,10 +15367,10 @@ XLineJointItem LineJoint SID_ATTR_LINE_JOINT
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15443,10 +15394,10 @@ XLineCapItem LineCap SID_ATTR_LINE_CAP
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15630,10 +15581,10 @@ SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15655,10 +15606,10 @@ SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15680,10 +15631,10 @@ SfxUInt32Item TransRotY SID_ATTR_TRANSFORM_ROT_Y
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15705,70 +15656,17 @@ SfxBoolItem ProtectPos SID_ATTR_TRANSFORM_PROTECT_POS
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
-]
-
-//--------------------------------------------------------------------------
-
-SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
-[
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
-]
-
-//--------------------------------------------------------------------------
-
-SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
+SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
[
- /* flags: */
AutoUpdate = TRUE,
Cachable = Cachable,
FastCall = FALSE,
@@ -15783,17 +15681,16 @@ SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
Readonly = FALSE,
- /* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -15814,8 +15711,8 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
@@ -15841,8 +15738,8 @@ SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
@@ -15969,10 +15866,10 @@ SfxVoidItem SCDialogBorder SID_CELL_FORMAT_BORDER
Asynchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 88d20dd..5bf99d2 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -933,37 +933,12 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
{
case BT_TBX_INDENT_PROMOTE:
{
- SvxLRSpaceItem aMargin( SID_ATTR_PARA_RIGHT );
-
- maTxtLeft += INDENT_STEP;
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
- aMargin.SetTxtLeft( (const long)nVal );
- aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
-
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_RIGHT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_RIGHT, SFX_CALLMODE_RECORD );
}
break;
case BT_TBX_INDENT_DEMOTE:
{
- if((maTxtLeft - INDENT_STEP) < 0)
- maTxtLeft = DEFAULT_VALUE;
- else
- maTxtLeft -= INDENT_STEP;
-
- SvxLRSpaceItem aMargin( SID_ATTR_PARA_LEFT );
-
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
-
- aMargin.SetTxtLeft( (const long)nVal );
- aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
-
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LEFT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_LEFT, SFX_CALLMODE_RECORD );
}
break;
case SD_HANGING_INDENT:
@@ -973,8 +948,7 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ))*(-1) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
}
break;
}
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index f8f28b2..4bc846f 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -84,9 +84,7 @@ public:
void ShowMenu (void);
sal_uInt16 GetBulletTypeIndex(){ return mnBulletTypeIndex; }
- void SetBulletTypeIndex(sal_uInt16 nInd){ mnBulletTypeIndex = nInd; }
sal_uInt16 GetNumTypeIndex(){ return mnNumTypeIndex; }
- void SetNumTypeIndex(sal_uInt16 nInd){ mnNumTypeIndex = nInd; }
FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
void EndSpacingPopupMode (void);
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 410bfa6..71315a9 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -1261,10 +1261,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_UNO_TITLE (FN_FRAME + 19)
#define FN_UNO_DESCRIPTION (FN_FRAME + 20)
-#define FN_PROPERTY_WRAP_DLG (FN_SIDEBAR + 0)
-#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 1)
-#define SID_ATTR_PAGE_ULSPACE (FN_SIDEBAR + 2)
-#define SID_ATTR_PAGE_LRSPACE (FN_SIDEBAR + 3)
+#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 0)
+#define SID_ATTR_PAGE_ULSPACE (FN_SIDEBAR + 1)
+#define SID_ATTR_PAGE_LRSPACE (FN_SIDEBAR + 2)
//Member-Ids fuer Fill/SetVariable an Items
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 285ae7d..8fea153e 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -189,7 +189,7 @@ interface BaseTextFrame
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_PROPERTY_WRAP_DLG // status(final|play)
+ FN_DRAW_WRAP_DLG // status(final|play)
[
ExecMethod = Execute ;
StateMethod = GetState ;
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 64e1782..12114f1 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -58,7 +58,7 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_PROPERTY_WRAP_DLG // status(final|play)
+ FN_DRAW_WRAP_DLG // status(final|play)
[
ExecMethod = Execute ;
StateMethod = GetAttrState ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index fd644ee..480d622 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3378,30 +3378,6 @@ SfxVoidItem GraphicDialog FN_FORMAT_GRAFIC_DLG
GroupId = GID_GRAPHIC;
]
//--------------------------------------------------------------------------
-SfxVoidItem ObjectWrapDialog FN_PROPERTY_WRAP_DLG
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerItem;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_GRAPHIC;
-]
-//--------------------------------------------------------------------------
SfxVoidItem SaveGraphic FN_SAVE_GRAPHIC
()
[
@@ -6309,10 +6285,10 @@ SfxVoidItem PageSettingDialog FN_FORMAT_PAGE_SETTING_DLG
Asynchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -10256,7 +10232,7 @@ SfxVoidItem CopyHyperlinkLocation FN_COPY_HYPERLINK_LOCATION
]
-SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN
+SfxInt16Item SwPageColumnType SID_ATTR_PAGE_COLUMN
[
/* flags: */
@@ -10275,11 +10251,11 @@ SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN
Readonly = TRUE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
SvxLongULSpaceItem SwPageULMargin SID_ATTR_PAGE_ULSPACE
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index c09610c..1821e68 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -416,7 +416,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
break;
case FN_FORMAT_FRAME_DLG:
- case FN_PROPERTY_WRAP_DLG:
+ case FN_DRAW_WRAP_DLG:
{
const int nSel = rSh.GetSelectionType();
if (nSel & nsSelectionType::SEL_GRF)
@@ -499,7 +499,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
nDefPage);
DBG_ASSERT(pDlg, "Dialogdiet fail!");
- if ( nSlot == FN_PROPERTY_WRAP_DLG )
+ if ( nSlot == FN_DRAW_WRAP_DLG )
{
pDlg->SetCurPageId(TP_FRM_WRAP);
}
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index c60f32b..357cb0c 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -114,7 +114,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
break;
case SID_INSERT_GRAPHIC:
case FN_FORMAT_GRAFIC_DLG:
- case FN_PROPERTY_WRAP_DLG:
+ case FN_DRAW_WRAP_DLG:
{
SwFlyFrmAttrMgr aMgr( sal_False, &rSh, rSh.IsFrmSelected() ?
FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
@@ -230,7 +230,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aSet, sal_False, DLG_FRM_GRF);
DBG_ASSERT(pDlg, "Dialogdiet fail!");
- if (nSlot == FN_PROPERTY_WRAP_DLG)
+ if (nSlot == FN_DRAW_WRAP_DLG)
pDlg->SetCurPageId(TP_FRM_WRAP);
if( pDlg->Execute() )
commit d5a5505c0ec568577ab62c086de0675738098761
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 11:17:37 2013 +0000
search for own abi.hxx header which is not in the system headers
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
index 765d9a0..aaee38f 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
@@ -56,7 +56,7 @@
OTHER DEALINGS IN THE SOFTWARE.
----------------------------------------------------------------------- */
-#include <abi.hxx>
+#include "abi.hxx"
#include <rtl/ustring.hxx>
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 765d9a0..aaee38f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -56,7 +56,7 @@
OTHER DEALINGS IN THE SOFTWARE.
----------------------------------------------------------------------- */
-#include <abi.hxx>
+#include "abi.hxx"
#include <rtl/ustring.hxx>
commit a3e7b7635385f096be693c63f0868fcd97c46a9a
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 11:05:43 2013 +0000
avoid terminate being called because of missing unwind tables in the Linux AMD64 bridge
The interesting discussion in http://gcc.gnu.org/ml/gcc/2012-03/threads.html#00455
pointed to the fnon-call-exception option to solve this problem. Thanks to Stephan
for starting this fruitful mailing list thread.
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
index 4dc34e3..1f0bc8f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
@@ -42,7 +42,7 @@ CFLAGS += -DLEAK_STATIC_DATA
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -fnon-call-exceptions
SLOFILES= \
$(SLO)$/abi.obj \
commit 52363a3ad822868e417c665def18d5302670403b
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 11:00:00 2013 +0000
add XMM clobbers to callVirtualMethod() bridge code on Linux AMD64
they are dirtied directly in the assembler code, so add them to the clobber list
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index aab7433..35d5203 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -149,7 +149,8 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
:
: "m" ( pMethod ), "m" ( pGPR ), "m" ( pFPR ), "m" ( nFPR ),
"m" ( rax ), "m" ( rdx ), "m" ( xmm0 ), "m" ( xmm1 )
- : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11"
+ : "rax", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "r11",
+ "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7"
);
switch (pReturnTypeRef->eTypeClass)
commit 246d57106712df34b05c2522c145d244df2d31eb
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 10:51:39 2013 +0000
i122042 corrected adding default values in LineStyleListBox
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4a5adb6e..147a0c7 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -164,6 +164,10 @@ SvxLineDefTabPage::SvxLineDefTabPage
aLbLineStyles.SetSelectHdl(
LINK( this, SvxLineDefTabPage, SelectLinestyleHdl_Impl ) );
+ // #122042# switch off default adding of 'none' and 'solid' entries
+ // for this ListBox; we want to select only editable/dashed styles
+ aLbLineStyles.setAddStandardFields(false);
+
// Absolut (in mm) oder Relativ (in %)
aCbxSynchronize.SetClickHdl(
LINK( this, SvxLineDefTabPage, ChangeMetricHdl_Impl ) );
@@ -191,7 +195,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
void SvxLineDefTabPage::Construct()
{
- // Linienstile
+ // Line style fill; do *not* add default fields here
aLbLineStyles.Fill( pDashList );
}
@@ -390,14 +394,17 @@ SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow,
IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
{
- if( pDashList->Count() > 0 )
+ if(pDashList->Count())
{
int nTmp = aLbLineStyles.GetSelectEntryPos();
- if( nTmp == LISTBOX_ENTRY_NOTFOUND )
+
+ if(LISTBOX_ENTRY_NOTFOUND == nTmp)
{
+ OSL_ENSURE(false, "OOps, non-existent LineDash selected (!)");
+ nTmp = 1;
}
- else
- aDash = pDashList->GetDash( nTmp )->GetDash();
+
+ aDash = pDashList->GetDash( nTmp )->GetDash();
FillDialog_Impl();
commit 33242bbc8350f2b253fae2d4261561796d848455
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 10:51:23 2013 +0000
i122042 corrected adding default values in LineStyleListBox
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index c15a948..2b0fdc8 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -388,18 +388,24 @@ public:
\************************************************************************/
class SVX_DLLPUBLIC LineLB : public ListBox
{
+private:
+ /// bitfield
+ /// defines if standard fields (none, solid) are added, default is true
+ bool mbAddStandardFields : 1;
public:
- LineLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {}
- LineLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {}
+ LineLB(Window* pParent, ResId Id);
+ LineLB(Window* pParent, WinBits aWB);
+ virtual ~LineLB();
+
+ virtual void Fill(const XDashList* pList);
- virtual void Fill( const XDashList* pList );
+ bool getAddStandardFields() const { return mbAddStandardFields; }
+ void setAddStandardFields(bool bNew);
- void Append( XDashEntry* pEntry, const Bitmap* pBmp = NULL );
- void Modify( XDashEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp = NULL );
- void SelectEntryByList( const XDashList* pList, const String& rStr,
- const XDash& rDash, sal_uInt16 nDist = 0 );
- // void FillStyles();
+ void Append(XDashEntry* pEntry, const Bitmap* pBmp = 0);
+ void Modify(XDashEntry* pEntry, sal_uInt16 nPos, const Bitmap* pBmp = 0);
+ void SelectEntryByList(const XDashList* pList, const String& rStr, const XDash& rDash, sal_uInt16 nDist = 0);
};
/*************************************************************************
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index b17e6aa..a0e8c4c 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1778,15 +1778,42 @@ void FillTypeLB::Fill()
|* Fuellt die Listbox (vorlaeufig) mit Strings
|*
\************************************************************************/
+LineLB::LineLB(Window* pParent, ResId Id)
+: ListBox(pParent, Id),
+ mbAddStandardFields(true)
+{
+}
+
+LineLB::LineLB(Window* pParent, WinBits aWB)
+: ListBox(pParent, aWB),
+ mbAddStandardFields(true)
+{
+}
+
+LineLB::~LineLB()
+{
+}
+
+void LineLB::setAddStandardFields(bool bNew)
+{
+ if(getAddStandardFields() != bNew)
+ {
+ mbAddStandardFields = bNew;
+ }
+}
+
void LineLB::Fill( const XDashList* pList )
{
Clear();
- // entry for 'none'
- InsertEntry(pList->GetStringForUiNoLine());
+ if(getAddStandardFields())
+ {
+ // entry for 'none'
+ InsertEntry(pList->GetStringForUiNoLine());
- // entry for solid line
- InsertEntry(pList->GetStringForUiSolidLine(), pList->GetBitmapForUISolidLine());
+ // entry for solid line
+ InsertEntry(pList->GetStringForUiSolidLine(), pList->GetBitmapForUISolidLine());
+ }
// entries for dashed lines
long nCount = pList->Count();
commit b902cae0a2f7d1546e5746bf81842122f60897e2
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Apr 17 08:40:36 2013 +0000
fix visibility of SdrUndo* destructors
destructing them via their baseclasses virtual destructor would be possible but
some aggressive compilers use their type knowledge to destruct them directly.
For such cases these destructors need to available as inlines or as visible symbols
which does not always seem to be the case for implicitly declared destructors.
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 2fe06d5..c804456 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -71,6 +71,8 @@ protected:
public:
TYPEINFO();
+ virtual ~SdrUndoAction() {}
+
virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
virtual void Repeat(SfxRepeatTarget& rView);
@@ -141,6 +143,7 @@ protected:
protected:
SdrUndoObj(SdrObject& rNewObj);
+ virtual ~SdrUndoObj() {}
void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat=sal_False) const;
@@ -187,6 +190,7 @@ protected:
public:
SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=sal_False, FASTBOOL bSaveText=sal_False);
virtual ~SdrUndoAttrObj();
+
void SetRepeatAttr(const SfxItemSet& rSet);
virtual void Undo();
virtual void Redo();
@@ -214,6 +218,7 @@ protected:
public:
SdrUndoMoveObj(SdrObject& rNewObj): SdrUndoObj(rNewObj) {}
SdrUndoMoveObj(SdrObject& rNewObj, const Size& rDist): SdrUndoObj(rNewObj),aDistance(rDist) {}
+ virtual ~SdrUndoMoveObj() {}
void SetDistance(const Size& rDist) { aDistance=rDist; }
const Size& GetDistance() const { return aDistance; }
@@ -333,6 +338,7 @@ class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
public:
SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
: SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); }
+ virtual ~SdrUndoDelObj() {}
virtual void Undo();
virtual void Redo();
@@ -357,6 +363,7 @@ class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj
public:
SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
: SdrUndoInsertObj(rNewObj,bOrdNumDirect) {}
+ virtual ~SdrUndoNewObj() {}
virtual void Undo();
virtual void Redo();
@@ -411,6 +418,7 @@ class SdrUndoCopyObj : public SdrUndoNewObj
public:
SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False)
: SdrUndoNewObj(rNewObj,bOrdNumDirect) {}
+ virtual ~SdrUndoCopyObj() {}
virtual String GetComment() const;
};
@@ -427,6 +435,7 @@ protected:
public:
SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
+ virtual ~SdrUndoObjOrdNum() {}
virtual void Undo();
virtual void Redo();
@@ -445,6 +454,7 @@ protected:
public:
SdrUndoObjectLayerChange(SdrObject& rObj, SdrLayerID aOldLayer, SdrLayerID aNewLayer);
+ virtual ~SdrUndoObjectLayerChange() {}
virtual void Undo();
virtual void Redo();
@@ -501,6 +511,7 @@ public:
const ObjStrAttrType eObjStrAttr,
const String& sOldStr,
const String& sNewStr);
+ virtual ~SdrUndoObjStrAttr() {}
virtual void Undo();
virtual void Redo();
@@ -538,6 +549,7 @@ protected:
protected:
SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
+public:
virtual ~SdrUndoLayer();
};
@@ -553,6 +565,7 @@ class SdrUndoNewLayer : public SdrUndoLayer
public:
SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {}
+ virtual ~SdrUndoNewLayer() {}
virtual void Undo();
virtual void Redo();
@@ -572,6 +585,7 @@ class SdrUndoDelLayer : public SdrUndoLayer
public:
SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; }
+ virtual ~SdrUndoDelLayer() {}
virtual void Undo();
virtual void Redo();
@@ -593,6 +607,7 @@ class SdrUndoMoveLayer : public SdrUndoLayer
public:
SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {}
+ virtual ~SdrUndoMoveLayer() {}
virtual void Undo();
virtual void Redo();
@@ -631,6 +646,7 @@ protected:
protected:
SdrUndoPage(SdrPage& rNewPg);
+ virtual ~SdrUndoPage() {}
void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, FASTBOOL bRepeat=sal_False) const;
};
@@ -697,6 +713,7 @@ class SVX_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList
{
public:
SdrUndoNewPage(SdrPage& rNewPg): SdrUndoPageList(rNewPg) {}
+ virtual ~SdrUndoNewPage() {}
virtual void Undo();
virtual void Redo();
@@ -716,6 +733,7 @@ class SdrUndoCopyPage : public SdrUndoNewPage
{
public:
SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {}
+ virtual ~SdrUndoCopyPage() {}
virtual String GetComment() const;
virtual String GetSdrRepeatComment(SdrView& rView) const;
@@ -741,6 +759,7 @@ protected:
public:
SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1)
: SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {}
+ virtual ~SdrUndoSetPageNum() {}
virtual void Undo();
virtual void Redo();
@@ -818,6 +837,7 @@ protected:
public:
SdrUndoPageChangeMasterPage(SdrPage& rChangedPage);
+ virtual ~SdrUndoPageChangeMasterPage() {}
virtual void Undo();
virtual void Redo();
commit 9efe7b16c664c558e234707498e38ccc2b744766
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 17 08:24:32 2013 +0000
i122041 Added WaE patch from Pavel
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index ac8bcd6..55333d9 100755
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -113,7 +113,6 @@ Size SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntry
nEntryCount++;
}
- const sal_uInt32 nRowCount(ceil(double(nEntryCount)/getColumnCount()));
const Size aItemSize(getEntryEdgeLength(), getEntryEdgeLength());
const WinBits aWinBits(GetStyle() & ~WB_VSCROLL);
@@ -127,7 +126,7 @@ Size SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntry
Size aNewSize(CalcWindowSizePixel(aItemSize, getColumnCount()));
// evtl. activate vertical scroll
- const bool bAdaptHeight(aNewSize.Height() > nHeight);
+ const bool bAdaptHeight(static_cast< sal_uInt32 >(aNewSize.Height()) > nHeight);
if(bAdaptHeight)
{
commit d73e77acab38d87418de38890e27ab3188725e3a
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 17 08:10:06 2013 +0000
Remove unused variable to prevent WaE issue.
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 10b5327..e70f065 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -115,7 +115,6 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
if ( pColorTable )
{
nColorCount = pColorTable->Count();
- XColorEntry* pEntry = NULL;
Color aColWhite( COL_WHITE );
String aStrWhite( EditResId( RID_SVXITEMS_COLOR_WHITE ) );
More information about the Libreoffice-commits
mailing list