[Libreoffice-commits] .: vcl/aqua vcl/Module_vcl.mk vcl/Package_osx.mk vcl/Zip_osxres.mk
vcl/Module_vcl.mk |2 - vcl/Package_osx.mk | 38 --- vcl/Zip_osxres.mk | 106 + 3 files changed, 107 insertions(+), 39 deletions(-) New commits: commit b5af1c35284560deaa862c2d87847b2088afcae0 Author: David Tardon dtar...@redhat.com Date: Wed Feb 29 12:34:33 2012 +0100 can use Zip for this diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index f9b86ed..7ec9395 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -75,7 +75,7 @@ endif ifeq ($(GUIBASE),aqua) $(eval $(call gb_Module_add_targets,vcl,\ -Package_osx \ +Zip_osxres \ )) endif diff --git a/vcl/Package_osx.mk b/vcl/Package_osx.mk deleted file mode 100644 index 17df37a..000 --- a/vcl/Package_osx.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# http://www.openoffice.org/license.html -# for a copy of the LGPLv3 License. -# -#* - -### FIXME: when we have a real ZipTarget mechanism in gbuild replace this mess -$(eval $(call gb_Package_Package,vcl_zip,)) -$(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip)) - -/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png - cd $(SRCDIR)/vcl/aqua/source/res ; \ - mkdir -p $(dir $@) ; \ - zip $@ MainMenu.nib/*.nib cursors/*.png - -# vim: set noet sw=4 ts=4: diff --git a/vcl/Zip_osxres.mk b/vcl/Zip_osxres.mk new file mode 100644 index 000..212b802 --- /dev/null +++ b/vcl/Zip_osxres.mk @@ -0,0 +1,106 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Zip_Zip,osxres,$(SRCDIR)/vcl/aqua/source/res)) + +$(eval $(call gb_Zip_add_files,osxres,\ +MainMenu.nib/classes.nib \ +MainMenu.nib/info.nib \ +MainMenu.nib/keyedobjects.nib \ +cursors/airbrush.png \ +cursors/ase.png \ +cursors/asn.png \ +cursors/asne.png \ +cursors/asns.png \ +cursors/asnswe.png \ +cursors/asnw.png \ +cursors/ass.png \ +cursors/asse.png \ +cursors/assw.png \ +cursors/asw.png \ +cursors/aswe.png \ +cursors/chain.png \ +cursors/chainnot.png \ +cursors/chart.png \ +cursors/copydata.png \ +cursors/copydlnk.png \ +cursors/copyf.png \ +cursors/copyf2.png \ +cursors/copyflnk.png \ +cursors/crook.png \ +cursors/crop.png \ +cursors/darc.png \ +cursors/dbezier.png \ +cursors/dcapt.png \ +cursors/dcirccut.png \ +cursors/dconnect.png \ +cursors/dellipse.png \ +cursors/detectiv.png \ +cursors/dfree.png \ +cursors/dline.png \ +cursors/dpie.png \ +cursors/dpolygon.png \ +cursors/drect.png \ +cursors/dtext.png \ +cursors/fill.png \ +cursors/help.png \ +cursors/hourglass.png \
[Libreoffice-commits] .: vcl/aqua vcl/source
vcl/aqua/source/app/salinst.cxx |6 +++---
vcl/aqua/source/app/salsys.cxx |4 ++--
vcl/aqua/source/dtrans/HtmlFmtFlt.cxx |4 ++--
vcl/aqua/source/dtrans/PictToBmpFlt.cxx |4 ++--
vcl/source/gdi/pdfwriter_impl.cxx |5 ++---
vcl/source/gdi/print3.cxx |2 +-
6 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 5d1acca5a9d40d6197e12fd959c3644bcc60f799
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Mon Feb 27 18:49:17 2012 +0530
Replace getLength() with isEmpty() where appropriate
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 7a01b0b..794dd84 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -997,7 +997,7 @@ rtl::OUString AquaSalInstance::GetDefaultPrinter()
// #i113170# may not be the main thread if called from UNO API
SalData::ensureThreadAutoreleasePool();
-if( ! maDefaultPrinter.getLength() )
+if( maDefaultPrinter.isEmpty() )
{
NSPrintInfo* pPI = [NSPrintInfo sharedPrintInfo];
DBG_ASSERT( pPI, no print info );
@@ -1138,10 +1138,10 @@ void AquaSalInstance::AddToRecentDocumentList(const
rtl::OUString rFileUrl, con
{
// Convert file URL for external use (see above)
rtl::OUString externalUrl = translateToExternalUrl(rFileUrl);
-if( 0 == externalUrl.getLength() )
+if( externalUrl.isEmpty() )
externalUrl = rFileUrl;
-if( externalUrl.getLength() !isDangerousUrl( externalUrl ) )
+if( !externalUrl.isEmpty() !isDangerousUrl( externalUrl ) )
{
NSString* pString = CreateNSString( externalUrl );
NSURL* pURL = [NSURL URLWithString: pString];
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 8a371d6..7c6f683 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -109,7 +109,7 @@ rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned
int nScreen )
static NSString* getStandardString( int nButtonId )
{
rtl::OUString aText( Button::GetStandardText( nButtonId ) );
-if( ! aText.getLength() ) // this is for bad cases, we might be missing
the vcl resource
+if( aText.isEmpty() ) // this is for bad cases, we might be missing the
vcl resource
{
switch( nButtonId )
{
@@ -121,7 +121,7 @@ static NSString* getStandardString( int nButtonId )
case BUTTON_NO :aText = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( No ) );break;
}
}
-return aText.getLength() ? CreateNSString( aText) : nil;
+return aText.isEmpty() ? nil : CreateNSString( aText);
}
int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString rTitle,
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index 0bd461d..275f5a1 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -65,9 +65,9 @@ const std::string TAG_END_BODY = std::string(/BODY);
Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
{
-OSL_ASSERT(aTextHtml.getLength() 0);
+OSL_ASSERT(!aTextHtml.isEmpty());
-if (!(aTextHtml.getLength() 0))
+if (aTextHtml.isEmpty())
return Sequencesal_Int8();
// fill the buffer with dummy values to calc the exact length
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 3eb4fb8..4b3d371 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -161,7 +161,7 @@ bool ImageToBMP( com::sun::star::uno::Sequencesal_Int8
aPict,
{
aBmp.realloc( [pOut length] );
[pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
-bResult = (aBmp.getLength() != 0);
+bResult = (!aBmp.isEmpty());
}
}
}
@@ -190,7 +190,7 @@ bool BMPToImage( com::sun::star::uno::Sequencesal_Int8
aBmp,
{
aPict.realloc( [pOut length] );
[pOut getBytes: aPict.getArray() length: aPict.getLength()];
-bResult = (aPict.getLength() != 0);
+bResult = (!aPict.isEmpty());
}
}
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 8456d86..3820d81 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6698,11 +6698,10 @@ PDFStreamIf::~PDFStreamIf()
void SAL_CALL PDFStreamIf::writeBytes( const com::sun::star::uno::Sequence
sal_Int8 aData ) throw()
{
-if( m_bWrite )
+if( m_bWrite aData.getLength() )
{
sal_Int32 nBytes = aData.getLength();
-if( nBytes 0 )
-m_pWriter-writeBuffer( aData.getConstArray(), nBytes );
+m_pWriter-writeBuffer( aData.getConstArray(), nBytes );
}
}
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
[Libreoffice-commits] .: vcl/aqua vcl/source
vcl/aqua/source/dtrans/HtmlFmtFlt.cxx |4 ++--
vcl/aqua/source/dtrans/PictToBmpFlt.cxx |4 ++--
vcl/source/gdi/print3.cxx |2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c581d33dec47a4c411a034482876543f6357d1e8
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Feb 27 17:12:33 2012 +0400
there is no Sequence::isEmpty()
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
index 275f5a1..0bd461d 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
@@ -65,9 +65,9 @@ const std::string TAG_END_BODY = std::string(/BODY);
Sequencesal_Int8 SAL_CALL TextHtmlToHTMLFormat(Sequencesal_Int8 aTextHtml)
{
-OSL_ASSERT(!aTextHtml.isEmpty());
+OSL_ASSERT(aTextHtml.getLength() 0);
-if (aTextHtml.isEmpty())
+if (!(aTextHtml.getLength() 0))
return Sequencesal_Int8();
// fill the buffer with dummy values to calc the exact length
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index 4b3d371..3eb4fb8 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -161,7 +161,7 @@ bool ImageToBMP( com::sun::star::uno::Sequencesal_Int8
aPict,
{
aBmp.realloc( [pOut length] );
[pOut getBytes: aBmp.getArray() length: aBmp.getLength()];
-bResult = (!aBmp.isEmpty());
+bResult = (aBmp.getLength() != 0);
}
}
}
@@ -190,7 +190,7 @@ bool BMPToImage( com::sun::star::uno::Sequencesal_Int8
aBmp,
{
aPict.realloc( [pOut length] );
[pOut getBytes: aPict.getArray() length: aPict.getLength()];
-bResult = (!aPict.isEmpty());
+bResult = (aPict.getLength() != 0);
}
}
}
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index abdece6..482491d 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1336,7 +1336,7 @@ void PrinterController::setValue( const
beans::PropertyValue i_rValue )
void PrinterController::setUIOptions( const Sequence beans::PropertyValue
i_rOptions )
{
-DBG_ASSERT( mpImplData-maUIOptions.isEmpty(), setUIOptions called twice
! );
+DBG_ASSERT( mpImplData-maUIOptions.getLength() == 0, setUIOptions called
twice ! );
mpImplData-maUIOptions = i_rOptions;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua vcl/source vcl/unx
vcl/aqua/source/app/salinst.cxx|3 ---
vcl/aqua/source/window/salmenu.cxx |2 +-
vcl/source/app/svdata.cxx | 14 --
vcl/source/window/winproc.cxx | 12 ++--
vcl/unx/gtk/window/gtkframe.cxx| 11 ---
5 files changed, 3 insertions(+), 39 deletions(-)
New commits:
commit 936ebcfa4b44a90bdc8789ce7556f1ba3599375c
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Tue Feb 21 13:06:11 2012 +1030
EasyHack fdo#46258 Removal of VCL testtool support (-enableautomation
option)
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index adae096..7a01b0b 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -206,9 +206,6 @@ static void initNSApp()
selector:
@selector(applicationWillResignActive:)
name: @AppleRemoteWillResignActive
object: nil ];
-
-if( ImplGetSVData()-mbIsTestTool )
-[NSApp activateIgnoringOtherApps: YES];
}
sal_Bool ImplSVMainHook( int * pnInit )
diff --git a/vcl/aqua/source/window/salmenu.cxx
b/vcl/aqua/source/window/salmenu.cxx
index 23d0180..f358e47 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -542,7 +542,7 @@ sal_Bool AquaSalMenu::VisibleMenuBar()
static const char *pExperimental = getenv (AQUA_NATIVE_MENUS);
-if ( ImplGetSVData()-mbIsTestTool || (pExperimental
!strcasecmp(pExperimental, FALSE)) )
+if ( pExperimental !strcasecmp(pExperimental, FALSE) )
return sal_False;
// End of experimental code enable/disable part
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 84b2df0..3cd 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -121,20 +121,6 @@ void ImplInitSVData()
pImplSVData-maHelpData.mbAutoHelpId = sal_True;
pImplSVData-maNWFData.maMenuBarHighlightTextColor = Color(
COL_TRANSPARENT );
-// find out whether we are running in the testtool
-// in this case we need some special workarounds
-sal_uInt32 nArgs = osl_getCommandArgCount();
-for( sal_uInt32 i = 0; i nArgs; i++ )
-{
-rtl::OUString aArg;
-osl_getCommandArg( i, aArg.pData );
-if( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( -enableautomation
) ) )
-{
-pImplSVData-mbIsTestTool = true;
-break;
-}
-}
-
// mark default layout border as unitialized
pImplSVData-maAppData.mnDefaultLayoutBorder = -1;
}
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a306fa5..504b753 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1851,15 +1851,11 @@ static void ImplHandleGetFocus( Window* pWindow )
// do not blink when they receive focus
if ( !pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId )
{
-bool bCallDirect = ImplGetSVData()-mbIsTestTool;
pWindow-ImplGetWindowImpl()-mpFrameData-mbStartFocusState =
!pWindow-ImplGetWindowImpl()-mpFrameData-mbHasFocus;
-if( ! bCallDirect )
-Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
+Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
Window* pFocusWin =
pWindow-ImplGetWindowImpl()-mpFrameData-mpFocusWin;
if ( pFocusWin pFocusWin-ImplGetWindowImpl()-mpCursor )
pFocusWin-ImplGetWindowImpl()-mpCursor-ImplShow();
-if( bCallDirect )
-pWindow-ImplAsyncFocusHdl( NULL );
}
}
@@ -1892,19 +1888,15 @@ static void ImplHandleLoseFocus( Window* pWindow )
// execute Focus-Events after a delay, such that SystemChildWindows
// do not flicker when they receive focus
-bool bCallDirect = ImplGetSVData()-mbIsTestTool;
if ( !pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId )
{
pWindow-ImplGetWindowImpl()-mpFrameData-mbStartFocusState =
!pWindow-ImplGetWindowImpl()-mpFrameData-mbHasFocus;
-if( ! bCallDirect )
-Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
+Application::PostUserEvent(
pWindow-ImplGetWindowImpl()-mpFrameData-mnFocusId, LINK( pWindow, Window,
ImplAsyncFocusHdl ) );
}
Window* pFocusWin = pWindow-ImplGetWindowImpl()-mpFrameData-mpFocusWin;
if ( pFocusWin pFocusWin-ImplGetWindowImpl()-mpCursor )
pFocusWin-ImplGetWindowImpl()-mpCursor-ImplHide();
-if( bCallDirect )
-pWindow-ImplAsyncFocusHdl( NULL );
}
// ---
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 7f4db68..7384a73 100644
[Libreoffice-commits] .: vcl/aqua writerfilter/qa writerfilter/source writerfilter/unocomponent xmloff/source xmlscript/source xmlscript/test xmlsecurity/tools
vcl/aqua/source/a11y/aqua11yfocuslistener.cxx |4
+-
writerfilter/qa/cppunittests/qname/testQName.cxx|2
-
writerfilter/source/dmapper/DomainMapperTableHandler.cxx|4
+-
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3
-
writerfilter/source/dmapper/GraphicImport.cxx |2
-
writerfilter/source/dmapper/StyleSheetTable.cxx |3
-
writerfilter/source/doctok/WW8DocumentImpl.cxx | 18
+-
writerfilter/source/resourcemodel/TagLogger.cxx |2
-
writerfilter/source/resourcemodel/resourcemodel.cxx | 10
++---
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx |2
-
xmloff/source/chart/SchXMLImport.cxx|4
+-
xmloff/source/chart/SchXMLSeries2Context.cxx| 14
+++
xmloff/source/chart/SchXMLSeriesHelper.cxx |6
+--
xmloff/source/chart/SchXMLTableContext.cxx |3
-
xmloff/source/draw/XMLShapeStyleContext.cxx |4
+-
xmloff/source/draw/animationexport.cxx |9
+
xmloff/source/draw/ximpstyl.cxx |4
+-
xmloff/source/style/xmlimppr.cxx|8
++--
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |2
-
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx |3
-
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx|8
++--
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx| 14
+++
xmlscript/test/imexp.cxx|6
+--
xmlsecurity/tools/standalone/csfit/certmngr.cxx |2
-
xmlsecurity/tools/standalone/csfit/decrypter.cxx|2
-
xmlsecurity/tools/standalone/csfit/encrypter.cxx|2
-
xmlsecurity/tools/standalone/csfit/signer.cxx |2
-
xmlsecurity/tools/standalone/csfit/verifier.cxx |2
-
xmlsecurity/tools/standalone/mscsfit/certmngr.cxx |2
-
xmlsecurity/tools/standalone/mscsfit/decrypter.cxx |2
-
xmlsecurity/tools/standalone/mscsfit/encrypter.cxx |2
-
xmlsecurity/tools/standalone/mscsfit/signer.cxx |2
-
xmlsecurity/tools/standalone/mscsfit/verifier.cxx |2
-
33 files changed, 73 insertions(+), 82 deletions(-)
New commits:
commit b35c0ae4ffce43b881d66efe74a19f1bf6299331
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Jan 9 03:16:33 2012 +0900
catch exception by constant reference
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 0b2fe19..62dc790 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -68,7 +68,7 @@ id AquaA11yFocusListener::getFocusedUIElement()
if( xContext.is() )
m_focusedObject = [ AquaA11yFactory
wrapperForAccessibleContext: xContext ];
}
-} catch( RuntimeException ) {
+} catch(const RuntimeException ) {
// intentionally do nothing ..
}
}
@@ -95,7 +95,7 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference
XAccessible xAcc
NSAccessibilityPostNotification(m_focusedObject,
NSAccessibilityFocusedUIElementChangedNotification);
}
}
-} catch( RuntimeException ) {
+} catch(const RuntimeException ) {
// intentionally do nothing ..
}
}
diff --git a/writerfilter/qa/cppunittests/qname/testQName.cxx
b/writerfilter/qa/cppunittests/qname/testQName.cxx
index 2a2b26e..1c0e24d 100644
--- a/writerfilter/qa/cppunittests/qname/testQName.cxx
+++ b/writerfilter/qa/cppunittests/qname/testQName.cxx
@@ -103,7 +103,7 @@ public:
sprintf(buf, name%i, i++);
testAdd(myns, buf);
}
-} catch (std::logic_error e)
+} catch (const std::logic_error )
{
// only way to exit this function
flag=true;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 6b04424..f9acfaa 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -714,7 +714,7 @@ void DomainMapperTableHandler::endTable()
m_xTableRange = xTable-getAnchor( );
}
}
-catch (
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/app/salinst.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d43f1e85aa768656a30cae9cbc131b072597250f
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Dec 14 17:58:39 2011 +0100
Adapted Mac-only code to ByteString reduction.
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 0898e67..3df6844 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -325,7 +325,7 @@ void InitSalMain()
if ( aCmdPath.Len() ) {
DirEntry aCmdDirEntry( aCmdPath );
aCmdDirEntry.ToAbs();
-aCmdPath = ByteString( aCmdDirEntry.GetPath().GetFull(),
RTL_TEXTENCODING_ASCII_US );
+aCmdPath = rtl::OUStringToOString(
aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
}
// Assign to PATH environment variable
if ( aCmdPath.Len() )
@@ -333,7 +333,7 @@ void InitSalMain()
aTmpPath = ByteString( PATH= );
aTmpPath += aCmdPath;
if ( aPath.Len() )
-aTmpPath += ByteString( DirEntry::GetSearchDelimiter(),
RTL_TEXTENCODING_ASCII_US );
+aTmpPath += rtl::OUStringToOString(
DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aPath;
putenv( (char*)aTmpPath.GetBuffer() );
}
@@ -343,7 +343,7 @@ void InitSalMain()
aTmpPath = ByteString( STAR_RESOURCEPATH= );
aTmpPath += aCmdPath;
if ( aResPath.Len() )
-aTmpPath += ByteString( DirEntry::GetSearchDelimiter(),
RTL_TEXTENCODING_ASCII_US );
+aTmpPath += rtl::OUStringToOString(
DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aResPath;
putenv( (char*)aTmpPath.GetBuffer() );
}
@@ -353,7 +353,7 @@ void InitSalMain()
aTmpPath = ByteString( DYLD_LIBRARY_PATH= );
aTmpPath += aCmdPath;
if ( aLibPath.Len() )
-aTmpPath += ByteString( DirEntry::GetSearchDelimiter(),
RTL_TEXTENCODING_ASCII_US );
+aTmpPath += rtl::OUStringToOString(
DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
aTmpPath += aLibPath;
putenv( (char*)aTmpPath.GetBuffer() );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/salprn.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 03f0a84c009b7c2738c8aaa52b5cc2a0b9ddd9f3
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 5 17:41:58 2011 +0100
fix build on macosx
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 6712243..46a0264 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -43,6 +43,7 @@
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/awt/Size.hpp
+#include com/sun/star/uno/Sequence.hpp
#include algorithm
@@ -50,6 +51,8 @@ using namespace vcl;
using namespace com::sun::star;
using namespace com::sun::star::beans;
+namespace uno = com::sun::star::uno;
+
using ::rtl::OUString;
using ::rtl::OStringToOUString;
@@ -366,7 +369,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
static Size getPageSize( vcl::PrinterController i_rController, sal_Int32
i_nPage )
{
Size aPageSize;
-Sequence PropertyValue aPageParms( i_rController.getPageParameters(
i_nPage ) );
+uno::Sequence PropertyValue aPageParms(
i_rController.getPageParameters( i_nPage ) );
for( sal_Int32 nProperty = 0, nPropertyCount = aPageParms.getLength();
nProperty nPropertyCount; ++nProperty )
{
if( aPageParms[ nProperty ].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( PageSize ) ) )
@@ -515,7 +518,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString*
i_pFileName,
if( pPrintOperation )
{
NSObject* pReleaseAfterUse = nil;
-bool bShowPanel = (! i_rController.isDirectPrint()
getUseNativeDialog() i_rController.isShowDialogs() );
+bool bShowPanel = (! i_rController.isDirectPrint()
useSystemPrintDialog() i_rController.isShowDialogs() );
[pPrintOperation setShowsPrintPanel: bShowPanel ? YES : NO ];
[pPrintOperation setShowsProgressPanel: bShowProgressPanel ?
YES : NO];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/salprn.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 7d900eb8d2945e1a48581bae5877a26ef418f9fb Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Dec 5 23:45:05 2011 +0100 possible fix for build breaker diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 238fe87..69e02c2 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -51,8 +51,6 @@ using namespace vcl; using namespace com::sun::star; using namespace com::sun::star::beans; -namespace uno = com::sun::star::uno; - using ::rtl::OUString; using ::rtl::OStringToOUString; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/aquaprintaccessoryview.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1722c68c81974e509fe11910a5190c01e455d39e
Author: August Sodora aug...@gmail.com
Date: Thu Dec 1 17:44:41 2011 -0500
Fix build in macosx
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 3a7fc59..17ee5a4 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -774,7 +774,7 @@ static void linebreakCell( NSCell* pBtn, const
rtl::OUString i_rText )
if( nIndex nLen )
{
rtl::OUStringBuffer aBuf( i_rText );
-aBuf.setCharAt( nIndex, '\n' );
+aBuf[nIndex] = '\n';
pText = CreateNSString( aBuf.makeStringAndClear() );
[pBtn setTitle: pText];
[pText release];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua vcl/ios vcl/source vcl/win
vcl/aqua/source/window/salframe.cxx |3 +--
vcl/ios/source/window/salframe.cxx |3 +--
vcl/source/app/dbggui.cxx |3 +--
vcl/source/app/settings.cxx |6 ++
vcl/source/control/edit.cxx |3 +--
vcl/source/control/menubtn.cxx |6 ++
vcl/source/gdi/regband.cxx |3 +--
vcl/source/window/accmgr.cxx|6 ++
vcl/source/window/brdwin.cxx|6 ++
vcl/source/window/msgbox.cxx|3 +--
vcl/source/window/splitwin.cxx |3 +--
vcl/source/window/tabdlg.cxx|3 +--
vcl/source/window/toolbox.cxx |3 +--
vcl/source/window/window.cxx| 12
vcl/win/source/gdi/salgdi.cxx |9 +++--
vcl/win/source/window/salobj.cxx|3 +--
16 files changed, 25 insertions(+), 50 deletions(-)
New commits:
commit 2411ea09a8d20609e48b0750ab2102c00e0c3b8a
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Nov 7 12:49:03 2011 +
redundant if not-null checks on delete
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index 5ac2842..7733649 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -128,8 +128,7 @@ AquaSalFrame::~AquaSalFrame()
if( this == s_pCaptureFrame )
s_pCaptureFrame = NULL;
-if ( mpGraphics )
-delete mpGraphics;
+delete mpGraphics;
if( mpDockMenuEntry )
// life cycle comment: the menu has ownership of the item, so no
release
diff --git a/vcl/ios/source/window/salframe.cxx
b/vcl/ios/source/window/salframe.cxx
index 8e2ea9d..3aab37a 100644
--- a/vcl/ios/source/window/salframe.cxx
+++ b/vcl/ios/source/window/salframe.cxx
@@ -106,8 +106,7 @@ IosSalFrame::~IosSalFrame()
if( this == s_pCaptureFrame )
s_pCaptureFrame = NULL;
-if ( mpGraphics )
-delete mpGraphics;
+delete mpGraphics;
if ( mpView ) {
[mpView release];
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 6e76706..468e7c8 100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1998,8 +1998,7 @@ void DbgGUIDeInit()
DbgSetAbort( NULL );
DbgWindow* pDbgWindow = ImplGetSVData()-maWinData.mpDbgWin;
-if ( pDbgWindow )
-delete pDbgWindow;
+delete pDbgWindow;
}
// ---
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1795d5a..533fe6b 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1546,10 +1546,8 @@ ImplAllSettingsData::ImplAllSettingsData( const
ImplAllSettingsData rData ) :
ImplAllSettingsData::~ImplAllSettingsData()
{
-if ( mpLocaleDataWrapper )
-delete mpLocaleDataWrapper;
-if ( mpUILocaleDataWrapper )
-delete mpUILocaleDataWrapper;
+delete mpLocaleDataWrapper;
+delete mpUILocaleDataWrapper;
if ( mpI18nHelper )
delete mpI18nHelper;
if ( mpUII18nHelper )
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index cf83869..a0a81e9 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -253,8 +253,7 @@ Edit::~Edit()
delete mpIMEInfos;
-if ( mpUpdateDataTimer )
-delete mpUpdateDataTimer;
+delete mpUpdateDataTimer;
if ( mxDnDListener.is() )
{
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 13513f6..2e1ad53 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -133,10 +133,8 @@ void MenuButton::ImplLoadRes( const ResId rResId )
MenuButton::~MenuButton()
{
-if ( mpMenuTimer )
-delete mpMenuTimer;
-if ( mpOwnMenu )
-delete mpOwnMenu;
+delete mpMenuTimer;
+delete mpOwnMenu;
}
// ---
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 1cec295..b091783 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -201,8 +201,7 @@ void ImplRegionBand::ProcessPoints()
}
// remove last element if necessary
-if ( pRegionBandPoint )
-delete pRegionBandPoint;
+delete pRegionBandPoint;
// list is now empty
mpFirstBandPoint = NULL;
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 43c78d5..a14530a 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -43,10 +43,8 @@ DBG_NAMEEX( Accelerator )
ImplAccelManager::~ImplAccelManager()
{
-if ( mpAccelList )
-delete mpAccelList;
-if ( mpSequenceList )
-delete mpSequenceList;
+delete mpAccelList;
+delete mpSequenceList;
}
// ---
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index d048b3a..bf25f34 100644
---
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/salatsuifontutils.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 78b1cc1a08d712212152a1e57400c8b07654e471
Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch
Date: Fri Oct 7 20:40:01 2011 +0200
Revert cppcheck scope reduction in vcl/..salatsuifontutils.cxx
This reverts commit e45b962f49829d5c60c913383b2132b579af3fab.
this is the most probale cause of the breakage on MacOSX tinderbox.
Do not really understand why it should break, but I do not see other
potential guilty commits... No MacOSX at hand... so revert and see
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx
b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index d9d2c8e..e124b3c 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -237,6 +237,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID,
ImplDevFontAttributes rDF
return false;
int nBestNameValue = 0;
int nBestStyleValue = 0;
+FontLanguageCode eBestLangCode = 0;
const FontLanguageCode eUILangCode =
Application::GetSettings().GetUILanguage();
typedef std::vectorchar NameBuffer;
NameBuffer aNameBuffer( 256 );
@@ -332,7 +333,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID,
ImplDevFontAttributes rDF
{
// get the best family name
nBestNameValue = nNameValue;
-FontLanguageCode eBestLangCode = eFontNameLanguage;
+eBestLangCode = eFontNameLanguage;
rDFA.maName = aUtf16Name;
}
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua vcl/inc vcl/ios vcl/source vcl/unx vcl/win
vcl/aqua/source/app/salinst.cxx |7 +--
vcl/inc/salinst.hxx |2 +-
vcl/ios/source/app/salinst.cxx|7 +--
vcl/source/app/svapp.cxx | 14 +-
vcl/unx/generic/plugadapt/salplug.cxx |7 +--
vcl/win/source/app/salinst.cxx|2 +-
6 files changed, 30 insertions(+), 9 deletions(-)
New commits:
commit 01e0b770a5ce58de44283465ba51b03a1ee0db0c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Sep 28 15:08:45 2011 +0200
Let SalAbort dump core on developer builds.
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index df0d95c..489b1dd 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -258,14 +258,17 @@ sal_Bool ImplSVMainHook( int * pnInit )
// ===
-void SalAbort( const XubString rErrorText )
+void SalAbort( const XubString rErrorText, bool bDumpCore )
{
if( !rErrorText.Len() )
fprintf( stderr, Application Error );
else
fprintf( stderr, %s ,
ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer()
);
-abort();
+if( bDumpCore )
+abort();
+else
+_exit(1);
}
// ---
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index d878dd7..194e61a 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -181,7 +181,7 @@ void DestroySalInstance( SalInstance* pInst );
// - SalInstance-Functions -
// -
-void SalAbort( const XubString rErrorText );
+void SalAbort( const XubString rErrorText, bool bDumpCore );
VCL_PLUGIN_PUBLIC const ::rtl::OUString SalGetDesktopEnvironment();
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index fb5bfb9..f7c9685 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -142,14 +142,17 @@ sal_Bool ImplSVMainHook( int * pnInit )
// ===
-void SalAbort( const XubString rErrorText )
+void SalAbort( const XubString rErrorText, bool bDumpCore )
{
if( !rErrorText.Len() )
fprintf( stderr, Application Error );
else
fprintf( stderr, %s ,
ByteString( rErrorText, gsl_getSystemTextEncoding() ).GetBuffer()
);
-abort();
+if( bDumpCore )
+abort();
+else
+_exit(1);
}
// ---
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index f426c11..b41f926 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -393,7 +393,19 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
void Application::Abort( const XubString rErrorText )
{
-SalAbort( rErrorText );
+//HACK: Dump core iff --norestore command line argument is given (assuming
+// this process is run by developers who are interested in cores, vs. end
+// users who are not):
+bool dumpCore = false;
+sal_uInt16 n = GetCommandLineParamCount();
+for (sal_uInt16 i = 0; i != n; ++i) {
+if (GetCommandLineParam(i).EqualsAscii(--norestore)) {
+dumpCore = true;
+break;
+}
+}
+
+SalAbort( rErrorText, dumpCore );
}
// ---
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 51321b8..d707760 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -267,13 +267,16 @@ void DeInitSalMain()
{
}
-void SalAbort( const XubString rErrorText )
+void SalAbort( const XubString rErrorText, bool bDumpCore )
{
if( !rErrorText.Len() )
std::fprintf( stderr, Application Error\n );
else
std::fprintf( stderr, %s\n, rtl::OUStringToOString(rErrorText,
osl_getThreadTextEncoding()).getStr() );
-exit(-1);
+if( bDumpCore )
+abort();
+else
+_exit(1);
}
static const char * desktop_strings[] = { none, unknown, GNOME, KDE,
KDE4 };
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 5e8930f..a0d41a6 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -84,7 +84,7 @@
// ===
-void SalAbort( const XubString rErrorText )
+void SalAbort( const XubString rErrorText, bool )
{
ImplFreeSalGDI();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
