buildbot success in ASF Buildbot on aoo-win7
Hi! , The aoo-win7 builder has just completed a run STATUS: Success Build revision 1468510 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-win7/builds/578 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-nightly
Hi! , The openoffice-linux64-nightly builder has just completed a run STATUS: Success Build revision 1468738 on branch openoffice/trunk Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: tethys_ubuntu Build results at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/578 Build reason was: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
buildbot failure in ASF Buildbot on aoo-w7l10n
Hi! , The aoo-w7l10n builder has just completed a run STATUS: Failure Build revision 1465779 on branch openoffice/branches/l10n Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7l10n/builds/89 Build reason was: The Nightly scheduler named 'aoo-win7-l10n' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1468804 - /openoffice/trunk/main/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
Author: paveljanik
Date: Wed Apr 17 09:10:06 2013
New Revision: 1468804
URL: http://svn.apache.org/r1468804
Log:
Remove unused variable to prevent WaE issue.
Modified:
openoffice/trunk/main/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
Modified: openoffice/trunk/main/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/miscdlgs/tabbgcolordlg.cxx?rev=1468804r1=1468803r2=1468804view=diff
==
--- openoffice/trunk/main/sc/source/ui/miscdlgs/tabbgcolordlg.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/miscdlgs/tabbgcolordlg.cxx Wed Apr 17
09:10:06 2013
@@ -115,7 +115,6 @@ void ScTabBgColorDlg::FillColorValueSets
if ( pColorTable )
{
nColorCount = pColorTable-Count();
-XColorEntry* pEntry = NULL;
Color aColWhite( COL_WHITE );
String aStrWhite( EditResId( RID_SVXITEMS_COLOR_WHITE ) );
svn commit: r1468851 - /openoffice/trunk/main/cui/source/tabpages/tplnedef.cxx
Author: alg
Date: Wed Apr 17 11:51:39 2013
New Revision: 1468851
URL: http://svn.apache.org/r1468851
Log:
i122042 corrected adding default values in LineStyleListBox
Modified:
openoffice/trunk/main/cui/source/tabpages/tplnedef.cxx
Modified: openoffice/trunk/main/cui/source/tabpages/tplnedef.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/tplnedef.cxx?rev=1468851r1=1468850r2=1468851view=diff
==
--- openoffice/trunk/main/cui/source/tabpages/tplnedef.cxx (original)
+++ openoffice/trunk/main/cui/source/tabpages/tplnedef.cxx Wed Apr 17 11:51:39
2013
@@ -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( W
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();
svn commit: r1468854 - /openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
Author: hdu Date: Wed Apr 17 12:00:00 2013 New Revision: 1468854 URL: http://svn.apache.org/r1468854 Log: 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 Modified: openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx Modified: openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx?rev=1468854r1=1468853r2=1468854view=diff == --- openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx (original) +++ openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx Wed Apr 17 12:00:00 2013 @@ -149,7 +149,8 @@ static void callVirtualMethod(void * pTh : : 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)
svn commit: r1468857 - /openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
Author: hdu Date: Wed Apr 17 12:05:43 2013 New Revision: 1468857 URL: http://svn.apache.org/r1468857 Log: 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. Modified: openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk Modified: openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk?rev=1468857r1=1468856r2=1468857view=diff == --- openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk (original) +++ openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk Wed Apr 17 12:05:43 2013 @@ -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 \
svn commit: r1468866 - in /openoffice/trunk/ext_libraries/coinmp: coinmp-1.6.0-clang.patch makefile.mk
Author: hdu Date: Wed Apr 17 12:31:34 2013 New Revision: 1468866 URL: http://svn.apache.org/r1468866 Log: fix build breaker by avoiding typedef of typeof magic for a simple type even recent clang versions choke on typedef typeof(SIG_DFL) at least on Mac Added: openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch Modified: openoffice/trunk/ext_libraries/coinmp/makefile.mk Added: openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch?rev=1468866view=auto == --- openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch (added) +++ openoffice/trunk/ext_libraries/coinmp/coinmp-1.6.0-clang.patch Wed Apr 17 12:31:34 2013 @@ -0,0 +1,14 @@ +--- misc/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2011-01-04 00:31:00.0 +0100 misc/build/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2013-03-01 18:22:08.0 +0100 +@@ -95,7 +95,10 @@ + + //- + +-#if defined(__MACH__) defined(__GNUC__) ++#if defined(__clang__) ++ typedef void(*CoinSighandler_t)(int); ++# define CoinSighandler_t_defined ++#elif defined(__MACH__) defined(__GNUC__) +typedef typeof(SIG_DFL) CoinSighandler_t; + # define CoinSighandler_t_defined + #endif Modified: openoffice/trunk/ext_libraries/coinmp/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/coinmp/makefile.mk?rev=1468866r1=1468865r2=1468866view=diff == --- openoffice/trunk/ext_libraries/coinmp/makefile.mk (original) +++ openoffice/trunk/ext_libraries/coinmp/makefile.mk Wed Apr 17 12:31:34 2013 @@ -45,14 +45,16 @@ all: TARFILE_NAME=CoinMP-1.6.0 TARFILE_MD5=2b5f1ca58d6ef30f18f1415b65bed81c -PATCH_FILES=coinmp-1.6.0.patch +PATCH_FILES=coinmp-1.6.0.patch coinmp-1.6.0-clang.patch .IF $(COM)==MSC BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe CoinMP\\MSVisualStudio\\v9\\CoinMP.sln Release|Win32 .ELSE CONFIGURE_ACTION=./configure -CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib -BUILD_ACTION=$(GNUMAKE) +#CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' CFLAGS='$(ARCH_FLAGS) -Wc,-arch -Wc,i386' CPPFLAGS='$(ARCH_FLAGS)' LDFLAGS='$(ARCH_FLAGS)' compiler_flags='$(ARCH_FLAGS)' +CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC) $(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' +#BUILD_ACTION= CC=$(CC) $(ARCH_FLAGS) CPP=$(CXX) $(ARCH_FLAGS) $(GNUMAKE) -j8 +BUILD_ACTION= $(GNUMAKE) -j8 .ENDIF OUT2INC+=CoinMP$/src/CoinMP.h
svn commit: r1468878 - in /openoffice/trunk/main: officecfg/registry/data/org/openoffice/Office/UI/ sc/sdi/ svx/inc/svx/ svx/sdi/ svx/source/sidebar/paragraph/ sw/inc/ sw/sdi/ sw/source/ui/shells/
Author: orw Date: Wed Apr 17 12:50:36 2013 New Revision: 1468878 URL: http://svn.apache.org/r1468878 Log: 122025: - UNO commands introduced with sidebar: apply labels and disable them UI customization Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu openoffice/trunk/main/sc/sdi/scalc.sdi openoffice/trunk/main/svx/inc/svx/svxids.hrc openoffice/trunk/main/svx/sdi/svx.sdi openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx openoffice/trunk/main/sw/inc/cmdid.h openoffice/trunk/main/sw/sdi/_frmsh.sdi openoffice/trunk/main/sw/sdi/_grfsh.sdi openoffice/trunk/main/sw/sdi/swriter.sdi openoffice/trunk/main/sw/source/ui/shells/frmsh.cxx openoffice/trunk/main/sw/source/ui/shells/grfsh.cxx Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu?rev=1468878r1=1468877r2=1468878view=diff == --- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu (original) +++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu Wed Apr 17 12:50:36 2013 @@ -768,6 +768,11 @@ value1/value /prop /node +node oor:name=.uno:NumberFormatType oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USNumber 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-USFlip Object Horizontally/value @@ -1205,6 +1210,11 @@ value xml:lang=en-USValidity.../value /prop /node +node oor:name=.uno:ViewGridLines oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USView 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-USColumn amp; Row Headers/value @@ -1307,6 +1317,11 @@ value xml:lang=en-USRow/value /prop /node +node oor:name=.uno:SCDialogBorder oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USCell Borders/value +/prop +/node node oor:name=.uno:SendTo oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=en-USSend/value Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?rev=1468878r1=1468877r2=1468878view=diff == --- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu (original) +++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu Wed Apr 17 12:50:36 2013 @@ -1421,6 +1421,11 @@ value9/value /prop /node +node oor:name=.uno:CurrentBulletListType oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USCurrent 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-USCurrent Date/value @@ -1431,6 +1436,11 @@ value xml:lang=en-USCurrent Language/value /prop /node +node oor:name=.uno:CurrentNumListType oor:op=replace +prop oor:name=Label oor:type=xs:string +value xml:lang=en-USCurrent 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-USCurrent Time/value @@ -1852,6 +1862,16 @@ value1/value
svn commit: r1468879 - /openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm
Author: hdu
Date: Wed Apr 17 12:55:50 2013
New Revision: 1468879
URL: http://svn.apache.org/r1468879
Log:
allow Mac port running with completely inactive AppleRemote
Modified:
openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm
Modified: openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm?rev=1468879r1=1468878r2=1468879view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm Wed Apr 17 12:55:50
2013
@@ -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
svn commit: r1468884 - in /openoffice/trunk/main/vcl/aqua/source/a11y: aqua11yfocuslistener.cxx aqua11yfocuslistener.hxx
Author: hdu
Date: Wed Apr 17 13:02:55 2013
New Revision: 1468884
URL: http://svn.apache.org/r1468884
Log:
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
Modified:
openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
Modified: openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx?rev=1468884r1=1468883r2=1468884view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
(original)
+++ openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx Wed Apr
17 13:02:55 2013
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::access
using namespace ::com::sun::star::uno;
-rtl::Reference AquaA11yFocusListener AquaA11yFocusListener::theListener;
+static rtl::Reference AquaA11yFocusListener theListener;
//--
Modified: openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx?rev=1468884r1=1468883r2=1468884view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
(original)
+++ openoffice/trunk/main/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx Wed Apr
17 13:02:55 2013
@@ -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_
+
svn commit: r1468888 - /openoffice/trunk/main/vcl/source/app/settings.cxx
Author: hdu Date: Wed Apr 17 13:05:15 2013 New Revision: 146 URL: http://svn.apache.org/r146 Log: WaE: extraneous parantheses - replaced by simplification Modified: openoffice/trunk/main/vcl/source/app/settings.cxx Modified: openoffice/trunk/main/vcl/source/app/settings.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/settings.cxx?rev=146r1=1468887r2=146view=diff == --- openoffice/trunk/main/vcl/source/app/settings.cxx (original) +++ openoffice/trunk/main/vcl/source/app/settings.cxx Wed Apr 17 13:05:15 2013 @@ -398,10 +398,7 @@ sal_Bool KeyboardSettings::operator ==( 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 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); } // ===
svn commit: r1468892 - /openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
Author: hdu
Date: Wed Apr 17 13:10:19 2013
New Revision: 1468892
URL: http://svn.apache.org/r1468892
Log:
WaE: remove semicolon before objc method body
Modified:
openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm?rev=1468892r1=1468891r2=1468892view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
(original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm Wed Apr
17 13:10:19 2013
@@ -482,7 +482,7 @@ static void filterAccelerator( rtl::OUSt
}
return self;
}
--(void)triggered:(id)pSender;
+-(void)triggered:(id)pSender
{
if( [pSender isMemberOfClass: [NSPopUpButton class]] )
{
@@ -523,7 +523,7 @@ static void filterAccelerator( rtl::OUSt
}
mpController-updateEnableState();
}
--(void)triggeredNumeric:(id)pSender;
+-(void)triggeredNumeric:(id)pSender
{
if( [pSender isMemberOfClass: [NSTextField class]] )
{
@@ -1100,7 +1100,7 @@ static void addEdit( NSView* pCurParent,
}
@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 )
svn commit: r1468897 - in /openoffice/trunk/main/svx: inc/svx/ source/sidebar/line/ source/sidebar/paragraph/ source/sidebar/text/
Author: alg
Date: Wed Apr 17 13:15:11 2013
New Revision: 1468897
URL: http://svn.apache.org/r1468897
Log:
i122041 Added 'Automatic' to TextPropertyPanel FontColor and HilightColor,
added 'No Color' to ParagraphPropertyPanel BackgroundColor
Modified:
openoffice/trunk/main/svx/inc/svx/dialogs.hrc
openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc
openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src
Modified: openoffice/trunk/main/svx/inc/svx/dialogs.hrc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/dialogs.hrc?rev=1468897r1=1468896r2=1468897view=diff
==
--- openoffice/trunk/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/trunk/main/svx/inc/svx/dialogs.hrc Wed Apr 17 13:15:11 2013
@@ -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)
Modified: openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx?rev=1468897r1=1468896r2=1468897view=diff
==
--- openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx Wed Apr
17 13:15:11 2013
@@ -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, ChangeTran
+namespace
+{
+Color GetTransparentColor (void)
+{
+return COL_TRANSPARENT;
+}
+} // end of anonymous namespace
+
PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer*
pParent)
{
-const ResId aResId(SVX_RES(STR_AUTOMATICE));
-
return new ColorControl(
pParent,
mpBindings,
@@ -928,7 +929,7 @@ PopupControl* LinePropertyPanel::CreateC
::boost::bind(GetTransparentColor),
::boost::bind(LinePropertyPanel::SetColor, this, _1, _2),
pParent,
-aResId);
+0);
}
Modified: openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc?rev=1468897r1=1468896r2=1468897view=diff
==
--- openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc
(original)
+++ openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc Wed Apr
17 13:15:11 2013
@@ -71,7 +71,6 @@
//color popup page
#define VS_COLOR 1
-#define STR_AUTOMATICE 2
//style popup page
#define VS_STYLE 1
Modified: openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src?rev=1468897r1=1468896r2=1468897view=diff
==
--- openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src
(original)
+++ openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src Wed Apr
17 13:15:11 2013
@@ -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
{
Modified:
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx?rev=1468897r1=1468896r2=1468897view=diff
==
---
svn commit: r1468907 - in /openoffice/trunk/main/vcl/aqua/source: app/ gdi/ window/
Author: hdu
Date: Wed Apr 17 13:32:55 2013
New Revision: 1468907
URL: http://svn.apache.org/r1468907
Log:
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.
Modified:
openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintview.mm
openoffice/trunk/main/vcl/aqua/source/gdi/salbmp.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/salprn.cxx
openoffice/trunk/main/vcl/aqua/source/gdi/salvd.cxx
openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx
openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm
openoffice/trunk/main/vcl/aqua/source/window/salnsmenu.mm
openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx
Modified: openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx?rev=1468907r1=1468906r2=1468907view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/salinst.cxx Wed Apr 17 13:32:55
2013
@@ -1326,7 +1326,7 @@ NSImage* CreateNSImage( const Image rIm
NSGraphicsContext* pContext = [NSGraphicsContext currentContext];
CGContextRef rCGContext = reinterpret_castCGContextRef([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];
Modified: openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm?rev=1468907r1=1468906r2=1468907view=diff
==
--- openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
(original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm Wed Apr
17 13:32:55 2013
@@ -805,7 +805,7 @@ static void addBool( NSView* pCurParent,
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
// 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,
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,
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,
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,
svn commit: r1468957 - in /openoffice/trunk/main/sd: sdi/drtxtob.sdi source/ui/view/drtxtob1.cxx
Author: orw
Date: Wed Apr 17 15:08:30 2013
New Revision: 1468957
URL: http://svn.apache.org/r1468957
Log:
122025: followup - remove usage of removed Slot
Modified:
openoffice/trunk/main/sd/sdi/drtxtob.sdi
openoffice/trunk/main/sd/source/ui/view/drtxtob1.cxx
Modified: openoffice/trunk/main/sd/sdi/drtxtob.sdi
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/sdi/drtxtob.sdi?rev=1468957r1=1468956r2=1468957view=diff
==
--- openoffice/trunk/main/sd/sdi/drtxtob.sdi (original)
+++ openoffice/trunk/main/sd/sdi/drtxtob.sdi Wed Apr 17 15:08:30 2013
@@ -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 : ?
[
Modified: openoffice/trunk/main/sd/source/ui/view/drtxtob1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drtxtob1.cxx?rev=1468957r1=1468956r2=1468957view=diff
==
--- openoffice/trunk/main/sd/source/ui/view/drtxtob1.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drtxtob1.cxx Wed Apr 17 15:08:30
2013
@@ -241,7 +241,6 @@ void TextObjectBar::Execute( SfxRequest
break;
case SID_OUTLINE_LEFT:
- case SID_ATTR_PARA_LEFT:
{
if (pOLV)
{
@@ -257,7 +256,6 @@ void TextObjectBar::Execute( SfxRequest
break;
case SID_OUTLINE_RIGHT:
- case SID_ATTR_PARA_RIGHT:
{
if (pOLV)
{
svn commit: r1468963 - /openoffice/trunk/main/sc/sdi/drawsh.sdi
Author: alg Date: Wed Apr 17 15:15:54 2013 New Revision: 1468963 URL: http://svn.apache.org/r1468963 Log: 122072 map SID_ATTR_LINE_START and SID_ATTR_LINE_END to the correct GetState method GetDrawAttrState Modified: openoffice/trunk/main/sc/sdi/drawsh.sdi Modified: openoffice/trunk/main/sc/sdi/drawsh.sdi URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/sdi/drawsh.sdi?rev=1468963r1=1468962r2=1468963view=diff == --- openoffice/trunk/main/sc/sdi/drawsh.sdi (original) +++ openoffice/trunk/main/sc/sdi/drawsh.sdi Wed Apr 17 15:15:54 2013 @@ -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; ]
svn commit: r1468973 - /openoffice/trunk/main/sw/sdi/drawsh.sdi
Author: alg Date: Wed Apr 17 15:33:38 2013 New Revision: 1468973 URL: http://svn.apache.org/r1468973 Log: 122072 map SID_ATTR_LINE_START and SID_ATTR_LINE_END to the correct GetState method GetDrawAttrState Modified: openoffice/trunk/main/sw/sdi/drawsh.sdi Modified: openoffice/trunk/main/sw/sdi/drawsh.sdi URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/sdi/drawsh.sdi?rev=1468973r1=1468972r2=1468973view=diff == --- openoffice/trunk/main/sw/sdi/drawsh.sdi (original) +++ openoffice/trunk/main/sw/sdi/drawsh.sdi Wed Apr 17 15:33:38 2013 @@ -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; ]
buildbot success in ASF Buildbot on aoo-w7ia2
Hi! , The aoo-w7ia2 builder has just completed a run STATUS: Success Build revision 1463876 on branch openoffice/branches/ia2 Snapshot results at: http://ci.apache.org/projects/openoffice/ Build using the ASF buildslave: bb-win7 Build results at: http://ci.apache.org/builders/aoo-w7ia2/builds/76 Build reason was: The Nightly scheduler named 'aoo-win7-ia2' triggered this build Yours Sincerely - The ASF Buildbot (http://ci.apache.org/) -- Join the bui...@apache.org mailing list for help with Buildbot
svn commit: r1469157 - /openoffice/trunk/main/binfilter/
Author: jsc Date: Thu Apr 18 04:47:32 2013 New Revision: 1469157 URL: http://svn.apache.org/r1469157 Log: #113641# delete obsolete binfilter module, old binary filter not longer supported Removed: openoffice/trunk/main/binfilter/
