[Libreoffice-commits] .: Branch 'feature/gtk3' - 35 commits - basegfx/prj basegfx/util canvas/prj comphelper/Library_comphelp.mk comphelper/prj cppcanvas/prj dtrans/prj dtrans/source i18npool/source i18nutil/prj i18nutil/source padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk regexp/prj regexp/source sax/source sax/util sot/Library_sot.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svl/prj svl/source svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/inc svtools/Library_hatchwindowfactory.mk svtools/Library_productregistration.mk svtools/Library_svt.mk svtools/prj svtools/source toolkit/Library_tk.mk toolkit/source tools/inc tools/Library_tl.mk tools/prj tools/source tools/StaticLibrary_ooopathutils.mk ucbhelper/prj ucbhelper/source ucbhelper/util unotools/Library_utl.mk unotools/prj unotools/source vcl/aqua vcl/inc vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_ gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/prj vcl/source vcl/StaticLibrary_vclmain.mk vcl/unx vcl/win
Michael Meeks
michael at kemper.freedesktop.org
Tue Jun 21 05:40:40 PDT 2011
basegfx/prj/build.lst | 2
basegfx/util/makefile.mk | 4
canvas/prj/build.lst | 2
comphelper/Library_comphelp.mk | 6
comphelper/prj/build.lst | 2
cppcanvas/prj/build.lst | 2
dtrans/prj/build.lst | 2
dtrans/source/generic/clipboardmanager.cxx | 3
dtrans/source/test/test_dtrans.cxx | 4
i18npool/source/breakiterator/data/makefile.mk | 2
i18npool/source/collator/data/makefile.mk | 2
i18npool/source/indexentry/data/makefile.mk | 2
i18npool/source/isolang/makefile.mk | 4
i18npool/source/localedata/data/makefile.mk | 14 -
i18npool/source/paper/makefile.mk | 4
i18npool/source/textconversion/data/makefile.mk | 2
i18nutil/prj/build.lst | 2
i18nutil/source/utility/makefile.mk | 4
padmin/Executable_spadmin.bin.mk | 6
padmin/Library_spa.mk | 10
regexp/prj/d.lst | 1
regexp/source/makefile.mk | 4
regexp/source/reclass.cxx | 7
sax/source/expatwrap/makefile.mk | 4
sax/source/fastparser/makefile.mk | 4
sax/source/tools/makefile.mk | 4
sax/util/makefile.mk | 67 -----
sot/Library_sot.mk | 6
svl/Library_fsstorage.mk | 6
svl/Library_passwordcontainer.mk | 6
svl/Library_svl.mk | 7
svl/prj/build.lst | 2
svl/source/misc/strmadpt.cxx | 44 ++-
svl/source/numbers/zformat.cxx | 17 -
svl/source/svdde/ddesvr.cxx | 29 --
svtools/Executable_bmp.mk | 6
svtools/Executable_bmpsum.mk | 6
svtools/Executable_g2g.mk | 6
svtools/Library_hatchwindowfactory.mk | 6
svtools/Library_productregistration.mk | 6
svtools/Library_svt.mk | 8
svtools/inc/svtools/grfmgr.hxx | 1
svtools/inc/svtools/imapcirc.hxx | 2
svtools/inc/svtools/imapobj.hxx | 10
svtools/prj/build.lst | 2
svtools/source/config/optionsdrawinglayer.cxx | 9
svtools/source/contnr/imivctl1.cxx | 7
svtools/source/filter/exportdialog.cxx | 1
svtools/source/filter/filter2.cxx | 1
svtools/source/graphic/grfmgr.cxx | 1
svtools/source/graphic/grfmgr2.cxx | 1
svtools/source/misc/imap.cxx | 2
svtools/source/misc/imap2.cxx | 287 ++++--------------------
toolkit/Library_tk.mk | 6
toolkit/source/awt/vclxtoolkit.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 2
toolkit/source/layout/core/root.cxx | 6
toolkit/source/layout/vcl/wbutton.cxx | 4
tools/Library_tl.mk | 6
tools/StaticLibrary_ooopathutils.mk | 2
tools/inc/tools/fsys.hxx | 2
tools/prj/build.lst | 2
tools/source/fsys/wntmsc.hxx | 4
ucbhelper/prj/build.lst | 2
ucbhelper/source/provider/propertyvalueset.cxx | 12 -
ucbhelper/util/makefile.mk | 4
unotools/Library_utl.mk | 6
unotools/prj/build.lst | 2
unotools/source/config/fontcfg.cxx | 40 +--
unotools/source/ucbhelper/ucblockbytes.cxx | 68 +++--
vcl/Library_desktop_detector.mk | 6
vcl/Library_vcl.mk | 6
vcl/Library_vclplug_gen.mk | 6
vcl/Library_vclplug_gtk.mk | 6
vcl/Library_vclplug_gtk3.mk | 3
vcl/Library_vclplug_kde.mk | 6
vcl/Library_vclplug_kde4.mk | 6
vcl/Library_vclplug_svp.mk | 6
vcl/StaticLibrary_vclmain.mk | 7
vcl/aqua/source/gdi/salatslayout.cxx | 2
vcl/inc/vcl/field.hxx | 10
vcl/inc/vcl/gdimtf.hxx | 1
vcl/inc/vcl/graph.hxx | 1
vcl/inc/vcl/svgread.hxx | 1
vcl/prj/build.lst | 2
vcl/source/app/svapp.cxx | 4
vcl/source/app/svdata.cxx | 17 -
vcl/source/control/field2.cxx | 107 ++++----
vcl/source/gdi/metaact.cxx | 1
vcl/source/gdi/print3.cxx | 4
vcl/source/window/dndlcon.cxx | 30 --
vcl/source/window/window.cxx | 12 -
vcl/unx/generic/app/wmadaptor.cxx | 30 +-
vcl/unx/generic/plugadapt/salplug.cxx | 2
vcl/unx/gtk/a11y/atkutil.cxx | 136 +++++------
vcl/unx/gtk/app/gtksys.cxx | 25 +-
vcl/unx/headless/svppspgraphics.cxx | 8
vcl/unx/kde4/KDESalFrame.cxx | 2
vcl/win/source/window/salframe.cxx | 131 ++++------
99 files changed, 594 insertions(+), 803 deletions(-)
New commits:
commit e12c0fa56fe9eaecb064ebebe99626f9bbc7e307
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Jun 21 13:39:20 2011 +0100
tweak for new offuh header locations
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index a5a7d44..d913bf8 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -32,7 +32,8 @@ $(eval $(call gb_Library_set_include,vclplug_gtk3,\
-I$(SRCDIR)/vcl/inc \
-I$(SRCDIR)/vcl/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/offapi \
+ -I$(OUTDIR)/inc/udkapi \
-I$(OUTDIR)/inc \
))
commit 71bbac5380d00603f450d5e106a2a2e9c9d9743c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 12:37:25 2011 +0300
Use "Unix-style" (import) library names for MinGW, to match libs.mk
diff --git a/i18npool/source/isolang/makefile.mk b/i18npool/source/isolang/makefile.mk
index b8f0146..2ade308 100644
--- a/i18npool/source/isolang/makefile.mk
+++ b/i18npool/source/isolang/makefile.mk
@@ -43,7 +43,11 @@ SLOFILES= $(SLO)$/insys.obj \
$(SLO)$/mslangid.obj
SHL1TARGET= $(ISOLANG_TARGET)$(ISOLANG_MAJOR)$(COMID)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(ISOLANG_TARGET)
+.ELSE
+SHL1IMPLIB= $(ISOLANG_TARGET)$(ISOLANG_MAJOR)$(COMID)
+.ENDIF
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/i18npool/source/paper/makefile.mk b/i18npool/source/paper/makefile.mk
index fa05cc2..f0b9bc8 100644
--- a/i18npool/source/paper/makefile.mk
+++ b/i18npool/source/paper/makefile.mk
@@ -44,7 +44,11 @@ SLOFILES=$(SLO)$/paper.obj
SHL1OBJS=$(SLOFILES)
SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB=i$(TARGET)
+.ELSE
+SHL1IMPLIB=$(TARGET)$(DLLPOSTFIX)
+.ENDIF
DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
commit c2da66b404da58630b3ba710aed59f0288ea2653
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 12:34:30 2011 +0300
Don't use backslashes in #include, eek
diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index d50e969..fecbcd8 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -34,8 +34,8 @@
#ifndef ICC
#include <io.h>
#endif
-#include <sys\types.h>
-#include <sys\stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <direct.h>
#include <windows.h>
commit f62d2b771fe79cba660ed1007e95de9b1a098b3f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 20 23:06:57 2011 +0100
convert string
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index aaef670..c268fe4 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -111,7 +111,7 @@ public:
class VCL_DLLPUBLIC PatternFormatter : public FormatterBase
{
private:
- ByteString maEditMask;
+ rtl::OString m_aEditMask;
XubString maFieldString;
XubString maLiteralMask;
sal_uInt16 mnFormatFlags;
@@ -122,7 +122,8 @@ protected:
PatternFormatter();
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
- SAL_DLLPRIVATE void ImplSetMask( const ByteString& rEditMask, const XubString& rLiteralMask );
+ SAL_DLLPRIVATE void ImplSetMask(const rtl::OString& rEditMask,
+ const XubString& rLiteralMask);
SAL_DLLPRIVATE sal_Bool ImplIsSameMask() const { return mbSameMask; }
SAL_DLLPRIVATE sal_Bool& ImplGetInPattKeyInput() { return mbInPattKeyInput; }
@@ -131,9 +132,8 @@ public:
virtual void Reformat();
- void SetMask( const ByteString& rEditMask,
- const XubString& rLiteralMask );
- const ByteString& GetEditMask() const { return maEditMask; }
+ void SetMask(const rtl::OString& rEditMask, const XubString& rLiteralMask );
+ const rtl::OString& GetEditMask() const { return m_aEditMask; }
const XubString& GetLiteralMask() const { return maLiteralMask; }
void SetFormatFlags( sal_uInt16 nFlags ) { mnFormatFlags = nFlags; }
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 87c7789..ad01095 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -241,11 +241,11 @@ static int ImplKommaPointCharEqual( xub_Unicode c1, xub_Unicode c2 )
// -----------------------------------------------------------------------
static XubString ImplPatternReformat( const XubString& rStr,
- const ByteString& rEditMask,
+ const rtl::OString& rEditMask,
const XubString& rLiteralMask,
sal_uInt16 nFormatFlags )
{
- if ( !rEditMask.Len() )
+ if (rEditMask.isEmpty())
return rStr;
XubString aStr = rStr;
@@ -258,14 +258,14 @@ static XubString ImplPatternReformat( const XubString& rStr,
xub_StrLen i = 0;
xub_StrLen n;
- while ( i < rEditMask.Len() )
+ while ( i < rEditMask.getLength() )
{
if ( nStrIndex >= aStr.Len() )
break;
cChar = aStr.GetChar(nStrIndex);
cLiteral = rLiteralMask.GetChar(i);
- cMask = rEditMask.GetChar(i);
+ cMask = rEditMask[i];
// Aktuelle Position ein Literal
if ( cMask == EDITMASK_LITERAL )
@@ -281,11 +281,11 @@ static XubString ImplPatternReformat( const XubString& rStr,
// Dies ist dann der Fall, wenn es nicht in das Muster
// des naechsten nicht Literal-Zeichens passt
n = i+1;
- while ( n < rEditMask.Len() )
+ while ( n < rEditMask.getLength() )
{
- if ( rEditMask.GetChar(n) != EDITMASK_LITERAL )
+ if ( rEditMask[n] != EDITMASK_LITERAL )
{
- if ( !ImplIsPatternChar( cChar, rEditMask.GetChar(n) ) )
+ if ( !ImplIsPatternChar( cChar, rEditMask[n] ) )
nStrIndex++;
break;
}
@@ -318,9 +318,9 @@ static XubString ImplPatternReformat( const XubString& rStr,
if ( nFormatFlags & PATTERN_FORMAT_EMPTYLITERALS )
{
n = i;
- while ( n < rEditMask.Len() )
+ while ( n < rEditMask.getLength() )
{
- if ( rEditMask.GetChar( n ) == EDITMASK_LITERAL )
+ if ( rEditMask[n] == EDITMASK_LITERAL )
{
if ( ImplKommaPointCharEqual( cChar, rLiteralMask.GetChar( n ) ) )
i = n+1;
@@ -346,7 +346,7 @@ static XubString ImplPatternReformat( const XubString& rStr,
// -----------------------------------------------------------------------
-static void ImplPatternMaxPos( const XubString rStr, const ByteString& rEditMask,
+static void ImplPatternMaxPos( const XubString rStr, const rtl::OString& rEditMask,
sal_uInt16 nFormatFlags, sal_Bool bSameMask,
sal_uInt16 nCursorPos, sal_uInt16& rPos )
{
@@ -360,7 +360,7 @@ static void ImplPatternMaxPos( const XubString rStr, const ByteString& rEditMask
{
while ( nMaxPos )
{
- if ( (rEditMask.GetChar(nMaxPos-1) != EDITMASK_LITERAL) &&
+ if ( (rEditMask[nMaxPos-1] != EDITMASK_LITERAL) &&
(rStr.GetChar(nMaxPos-1) != ' ') )
break;
nMaxPos--;
@@ -369,9 +369,9 @@ static void ImplPatternMaxPos( const XubString rStr, const ByteString& rEditMask
// Wenn wir vor einem Literal stehen, dann solange weitersuchen,
// bis erste Stelle nach Literal
xub_StrLen nTempPos = nMaxPos;
- while ( nTempPos < rEditMask.Len() )
+ while ( nTempPos < rEditMask.getLength() )
{
- if ( rEditMask.GetChar(nTempPos) != EDITMASK_LITERAL )
+ if ( rEditMask[nTempPos] != EDITMASK_LITERAL )
{
nMaxPos = nTempPos;
break;
@@ -390,7 +390,7 @@ static void ImplPatternMaxPos( const XubString rStr, const ByteString& rEditMask
// -----------------------------------------------------------------------
static void ImplPatternProcessStrictModify( Edit* pEdit,
- const ByteString& rEditMask,
+ const rtl::OString& rEditMask,
const XubString& rLiteralMask,
sal_uInt16 nFormatFlags, sal_Bool bSameMask )
{
@@ -403,14 +403,14 @@ static void ImplPatternProcessStrictModify( Edit* pEdit,
xub_StrLen nMaxLen = aText.Len();
while ( i < nMaxLen )
{
- if ( (rEditMask.GetChar( i ) != EDITMASK_LITERAL) &&
+ if ( (rEditMask[i] != EDITMASK_LITERAL) &&
(aText.GetChar( i ) != ' ') )
break;
i++;
}
// Alle Literalzeichen beibehalten
- while ( i && (rEditMask.GetChar( i ) == EDITMASK_LITERAL) )
+ while ( i && (rEditMask[i] == EDITMASK_LITERAL) )
i--;
aText.Erase( 0, i );
}
@@ -442,14 +442,14 @@ static void ImplPatternProcessStrictModify( Edit* pEdit,
// -----------------------------------------------------------------------
-static xub_StrLen ImplPatternLeftPos( const ByteString& rEditMask, xub_StrLen nCursorPos )
+static xub_StrLen ImplPatternLeftPos(const rtl::OString& rEditMask, xub_StrLen nCursorPos)
{
// Vorheriges Zeichen suchen, was kein Literal ist
xub_StrLen nNewPos = nCursorPos;
xub_StrLen nTempPos = nNewPos;
while ( nTempPos )
{
- if ( rEditMask.GetChar(nTempPos-1) != EDITMASK_LITERAL )
+ if ( rEditMask[nTempPos-1] != EDITMASK_LITERAL )
{
nNewPos = nTempPos-1;
break;
@@ -461,16 +461,16 @@ static xub_StrLen ImplPatternLeftPos( const ByteString& rEditMask, xub_StrLen nC
// -----------------------------------------------------------------------
-static xub_StrLen ImplPatternRightPos( const XubString& rStr, const ByteString& rEditMask,
+static xub_StrLen ImplPatternRightPos( const XubString& rStr, const rtl::OString& rEditMask,
sal_uInt16 nFormatFlags, sal_Bool bSameMask,
xub_StrLen nCursorPos )
{
// Naechstes Zeichen suchen, was kein Literal ist
xub_StrLen nNewPos = nCursorPos;
xub_StrLen nTempPos = nNewPos;
- while ( nTempPos < rEditMask.Len() )
+ while ( nTempPos < rEditMask.getLength() )
{
- if ( rEditMask.GetChar(nTempPos+1) != EDITMASK_LITERAL )
+ if ( rEditMask[nTempPos+1] != EDITMASK_LITERAL )
{
nNewPos = nTempPos+1;
break;
@@ -484,14 +484,14 @@ static xub_StrLen ImplPatternRightPos( const XubString& rStr, const ByteString&
// -----------------------------------------------------------------------
static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
- const ByteString& rEditMask,
+ const rtl::OString& rEditMask,
const XubString& rLiteralMask,
sal_Bool bStrictFormat,
sal_uInt16 nFormatFlags,
sal_Bool bSameMask,
sal_Bool& rbInKeyInput )
{
- if ( !rEditMask.Len() || !bStrictFormat )
+ if ( rEditMask.isEmpty() || !bStrictFormat )
return sal_False;
Selection aOldSel = pEdit->GetSelection();
@@ -533,8 +533,8 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
{
// Home ist Position des ersten nicht literalen Zeichens
nNewPos = 0;
- while ( (nNewPos < rEditMask.Len()) &&
- (rEditMask.GetChar(nNewPos) == EDITMASK_LITERAL) )
+ while ( (nNewPos < rEditMask.getLength()) &&
+ (rEditMask[nNewPos] == EDITMASK_LITERAL) )
nNewPos++;
// Home sollte nicht nach rechts wandern
if ( nCursorPos < nNewPos )
@@ -548,9 +548,9 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
else if ( nKeyCode == KEY_END )
{
// End ist die Position des letzten nicht literalen Zeichens
- nNewPos = rEditMask.Len();
+ nNewPos = rEditMask.getLength();
while ( nNewPos &&
- (rEditMask.GetChar(nNewPos-1) == EDITMASK_LITERAL) )
+ (rEditMask[nNewPos-1] == EDITMASK_LITERAL) )
nNewPos--;
// Hier nehmen wir Selectionsanfang als minimum, da falls durch
// Focus alles selektiert ist, ist eine kleine Position schon
@@ -601,7 +601,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
{
if ( bSameMask )
{
- if ( rEditMask.GetChar( nNewPos ) != EDITMASK_LITERAL )
+ if ( rEditMask[nNewPos] != EDITMASK_LITERAL )
aStr.Erase( nNewPos, 1 );
}
else
@@ -647,9 +647,9 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
aSel.Justify();
nNewPos = (xub_StrLen)aSel.Min();
- if ( nNewPos < rEditMask.Len() )
+ if ( nNewPos < rEditMask.getLength() )
{
- xub_Unicode cPattChar = ImplPatternChar( cChar, rEditMask.GetChar(nNewPos) );
+ xub_Unicode cPattChar = ImplPatternChar( cChar, rEditMask[nNewPos] );
if ( cPattChar )
cChar = cPattChar;
else
@@ -661,17 +661,17 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
// nicht dazu fuehren, das der Anwender dann da steht, wo
// er nicht stehen wollte.
if ( nNewPos &&
- (rEditMask.GetChar(nNewPos-1) != EDITMASK_LITERAL) &&
+ (rEditMask[nNewPos-1] != EDITMASK_LITERAL) &&
!aSel.Len() )
{
// Naechstes Zeichen suchen, was kein Literal ist
nTempPos = nNewPos;
- while ( nTempPos < rEditMask.Len() )
+ while ( nTempPos < rEditMask.getLength() )
{
- if ( rEditMask.GetChar(nTempPos) == EDITMASK_LITERAL )
+ if ( rEditMask[nTempPos] == EDITMASK_LITERAL )
{
// Gilt nur, wenn ein Literalzeichen vorhanden
- if ( (rEditMask.GetChar(nTempPos+1) != EDITMASK_LITERAL ) &&
+ if ( (rEditMask[nTempPos+1] != EDITMASK_LITERAL ) &&
ImplKommaPointCharEqual( cChar, rLiteralMask.GetChar(nTempPos) ) )
{
nTempPos++;
@@ -705,7 +705,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
while ( n && (n > nNewPos) )
{
if ( (aStr.GetChar( n-1 ) != ' ') &&
- ((n > rEditMask.Len()) || (rEditMask.GetChar(n-1) != EDITMASK_LITERAL)) )
+ ((n > rEditMask.getLength()) || (rEditMask[n-1] != EDITMASK_LITERAL)) )
break;
n--;
@@ -715,14 +715,14 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
if ( aSel.Len() )
aStr.Erase( (xub_StrLen)aSel.Min(), (xub_StrLen)aSel.Len() );
- if ( aStr.Len() < rEditMask.Len() )
+ if ( aStr.Len() < rEditMask.getLength() )
{
// String evtl. noch bis Cursor-Position erweitern
if ( aStr.Len() < nNewPos )
aStr += rLiteralMask.Copy( aStr.Len(), nNewPos-aStr.Len() );
if ( nNewPos < aStr.Len() )
aStr.Insert( cChar, nNewPos );
- else if ( nNewPos < rEditMask.Len() )
+ else if ( nNewPos < rEditMask.getLength() )
aStr += cChar;
aStr = ImplPatternReformat( aStr, rEditMask, rLiteralMask, nFormatFlags );
}
@@ -740,7 +740,7 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
if ( nNewPos < aStr.Len() )
aStr.SetChar( nNewPos, cChar );
- else if ( nNewPos < rEditMask.Len() )
+ else if ( nNewPos < rEditMask.getLength() )
aStr += cChar;
}
@@ -764,19 +764,19 @@ static sal_Bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
// -----------------------------------------------------------------------
-void PatternFormatter::ImplSetMask( const ByteString& rEditMask,
- const XubString& rLiteralMask )
+void PatternFormatter::ImplSetMask(const rtl::OString& rEditMask,
+ const XubString& rLiteralMask)
{
- maEditMask = rEditMask;
+ m_aEditMask = rEditMask;
maLiteralMask = rLiteralMask;
mbSameMask = sal_True;
- if ( maEditMask.Len() != maLiteralMask.Len() )
+ if ( m_aEditMask.getLength() != maLiteralMask.Len() )
{
- if ( maEditMask.Len() < maLiteralMask.Len() )
- maLiteralMask.Erase( maEditMask.Len() );
+ if ( m_aEditMask.getLength() < maLiteralMask.Len() )
+ maLiteralMask.Erase(m_aEditMask.getLength());
else
- maLiteralMask.Expand( maEditMask.Len(), ' ' );
+ maLiteralMask.Expand(m_aEditMask.getLength(), ' ');
}
// StrictModus erlaubt nur Input-Mode, wenn als Maske nur
@@ -785,9 +785,9 @@ void PatternFormatter::ImplSetMask( const ByteString& rEditMask,
// nicht zugelassen sind
xub_StrLen i = 0;
sal_Char c = 0;
- while ( i < rEditMask.Len() )
+ while ( i < rEditMask.getLength() )
{
- sal_Char cTemp = rEditMask.GetChar( i );
+ sal_Char cTemp = rEditMask[i];
if ( cTemp != EDITMASK_LITERAL )
{
if ( (cTemp == EDITMASK_ALLCHAR) ||
@@ -830,7 +830,7 @@ PatternFormatter::PatternFormatter()
void PatternFormatter::ImplLoadRes( const ResId& rResId )
{
- ByteString aEditMask;
+ rtl::OString aEditMask;
XubString aLiteralMask;
ResMgr* pMgr = rResId.GetResMgr();
if( pMgr )
@@ -841,7 +841,10 @@ void PatternFormatter::ImplLoadRes( const ResId& rResId )
SetStrictFormat( (sal_Bool)pMgr->ReadShort() );
if ( PATTERNFORMATTER_EDITMASK & nMask )
- aEditMask = ByteString( pMgr->ReadString(), RTL_TEXTENCODING_ASCII_US );
+ {
+ aEditMask = rtl::OUStringToOString(pMgr->ReadString(),
+ RTL_TEXTENCODING_ASCII_US);
+ }
if ( PATTERNFORMATTER_LITTERALMASK & nMask )
aLiteralMask = pMgr->ReadString();
@@ -859,7 +862,7 @@ PatternFormatter::~PatternFormatter()
// -----------------------------------------------------------------------
-void PatternFormatter::SetMask( const ByteString& rEditMask,
+void PatternFormatter::SetMask( const rtl::OString& rEditMask,
const XubString& rLiteralMask )
{
ImplSetMask( rEditMask, rLiteralMask );
@@ -885,7 +888,7 @@ XubString PatternFormatter::GetString() const
if ( !GetField() )
return ImplGetSVEmptyStr();
else
- return ImplPatternReformat( GetField()->GetText(), maEditMask, maLiteralMask, mnFormatFlags );
+ return ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, mnFormatFlags );
}
// -----------------------------------------------------------------------
@@ -894,7 +897,7 @@ void PatternFormatter::Reformat()
{
if ( GetField() )
{
- ImplSetText( ImplPatternReformat( GetField()->GetText(), maEditMask, maLiteralMask, mnFormatFlags ) );
+ ImplSetText( ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, mnFormatFlags ) );
if ( !mbSameMask && IsStrictFormat() && !GetField()->IsReadOnly() )
GetField()->SetInsertMode( sal_False );
}
commit 8d420f79af65e2dbbc523ef2a625abbb621826a1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 20 22:46:12 2011 +0100
convert string
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 96c991b..60679ac 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6470,7 +6470,7 @@ void VCLXPatternField::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& Lit
PatternField* pPatternField = (PatternField*) GetWindow();
if ( pPatternField )
{
- EditMask = String( pPatternField->GetEditMask(), RTL_TEXTENCODING_ASCII_US );
+ EditMask = rtl::OStringToOUString(pPatternField->GetEditMask(), RTL_TEXTENCODING_ASCII_US);
LiteralMask = pPatternField->GetLiteralMask();
}
}
commit 78ad09121a614b2a14c633b166096b27f4b86318
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jun 20 21:39:11 2011 +0100
ByteString->rtl::OStringBuffer
diff --git a/svtools/inc/svtools/imapcirc.hxx b/svtools/inc/svtools/imapcirc.hxx
index 994bf02..cb8a275 100644
--- a/svtools/inc/svtools/imapcirc.hxx
+++ b/svtools/inc/svtools/imapcirc.hxx
@@ -43,7 +43,7 @@ class Fraction;
class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
{
Point aCenter;
- sal_uLong nRadius;
+ sal_Int32 nRadius;
void ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel );
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx
index daac9ee..025ac80 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/svtools/inc/svtools/imapobj.hxx
@@ -32,6 +32,7 @@
#include "svtools/svtdllapi.h"
#include <tools/string.hxx>
#include <svl/macitem.hxx>
+#include <rtl/strbuf.hxx>
class Point;
class Rectangle;
@@ -77,7 +78,6 @@ class SVT_DLLPUBLIC IMapObject
sal_Bool bActive;
protected:
-
sal_uInt16 nReadVersion;
// Binaer-Im-/Export
@@ -85,10 +85,10 @@ protected:
virtual void ReadIMapObject( SvStream& rIStm ) = 0;
// Hilfsmethoden
- void AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) const;
- void AppendCERNURL( ByteString& rStr, const String& rBaseURL ) const;
- void AppendNCSACoords( const Point& rPoint100, ByteString& rStr ) const;
- void AppendNCSAURL( ByteString& rStr, const String& rBaseURL ) const;
+ void AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const;
+ void AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const;
+ void AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const;
+ void AppendNCSAURL(rtl::OStringBuffer&rBuf, const String& rBaseURL) const;
public:
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index e1b74ae..1117085 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -433,7 +433,7 @@ sal_Bool IMapCircleObject::IsHit( const Point& rPoint ) const
const Point aPoint( aCenter - rPoint );
sal_Bool bRet = sal_False;
- if ( (sal_uLong) sqrt( (double) aPoint.X() * aPoint.X() +
+ if ( (sal_Int32) sqrt( (double) aPoint.X() * aPoint.X() +
aPoint.Y() * aPoint.Y() ) <= nRadius )
{
bRet = sal_True;
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 070ef6d..8be37fd 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -48,209 +48,111 @@
#define NOTEOL(c) ((c)!='\0')
-
TYPEINIT0_AUTOFACTORY( ImageMap );
-
-/******************************************************************************/
-/******************************************************************************/
-
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
-void IMapObject::AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) const
+void IMapObject::AppendCERNCoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const
{
const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
- rStr += '(';
- rStr += ByteString::CreateFromInt32( aPixPt.X() );
- rStr += ',';
- rStr += ByteString::CreateFromInt32( aPixPt.Y() );
- rStr += ") ";
+ rBuf.append('(');
+ rBuf.append(static_cast<sal_Int32>(aPixPt.X()));
+ rBuf.append(',');
+ rBuf.append(static_cast<sal_Int32>(aPixPt.Y()));
+ rBuf.append(RTL_CONSTASCII_STRINGPARAM(") "));
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
-void IMapObject::AppendNCSACoords( const Point& rPoint100, ByteString& rStr ) const
+void IMapObject::AppendNCSACoords(rtl::OStringBuffer& rBuf, const Point& rPoint100) const
{
const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) );
- rStr += ByteString::CreateFromInt32( aPixPt.X() );
- rStr += ',';
- rStr += ByteString::CreateFromInt32( aPixPt.Y() );
- rStr += ' ';
+ rBuf.append(static_cast<sal_Int32>(aPixPt.X()));
+ rBuf.append(',');
+ rBuf.append(static_cast<sal_Int32>(aPixPt.Y()));
+ rBuf.append(' ');
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
-void IMapObject::AppendCERNURL( ByteString& rStr, const String& rBaseURL ) const
+void IMapObject::AppendCERNURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
{
- rStr += ByteString( String(URIHelper::simpleNormalizedMakeRelative( rBaseURL, aURL )), gsl_getSystemTextEncoding() );
+ rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), gsl_getSystemTextEncoding()));
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
-void IMapObject::AppendNCSAURL( ByteString& rStr, const String& rBaseURL ) const
+void IMapObject::AppendNCSAURL(rtl::OStringBuffer& rBuf, const String& rBaseURL) const
{
- rStr += ByteString( String(URIHelper::simpleNormalizedMakeRelative( rBaseURL, aURL )), gsl_getSystemTextEncoding() );
- rStr += ' ';
+ rBuf.append(rtl::OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), gsl_getSystemTextEncoding()));
+ rBuf.append(' ');
}
-
-/******************************************************************************/
-/******************************************************************************/
-
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
{
- ByteString aStr( "rectangle " );
+ rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle "));
- AppendCERNCoords( aRect.TopLeft(), aStr );
- AppendCERNCoords( aRect.BottomRight(), aStr );
- AppendCERNURL( aStr, rBaseURL );
+ AppendCERNCoords(aStrBuf, aRect.TopLeft());
+ AppendCERNCoords(aStrBuf, aRect.BottomRight());
+ AppendCERNURL(aStrBuf, rBaseURL);
- rOStm.WriteLine( aStr );
+ rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
{
- ByteString aStr( "rect " );
+ rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect "));
- AppendNCSAURL( aStr, rBaseURL );
- AppendNCSACoords( aRect.TopLeft(), aStr );
- AppendNCSACoords( aRect.BottomRight(), aStr );
+ AppendNCSAURL(aStrBuf, rBaseURL);
+ AppendNCSACoords(aStrBuf, aRect.TopLeft());
+ AppendNCSACoords(aStrBuf, aRect.BottomRight());
- rOStm.WriteLine( aStr );
+ rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-
-/******************************************************************************/
-/******************************************************************************/
-
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
{
- ByteString aStr( "circle " );
+ rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
- AppendCERNCoords( aCenter, aStr );
- aStr += ByteString::CreateFromInt32(nRadius);
- aStr += ' ';
- AppendCERNURL( aStr, rBaseURL );
+ AppendCERNCoords(aStrBuf, aCenter);
+ aStrBuf.append(nRadius);
+ aStrBuf.append(' ');
+ AppendCERNURL(aStrBuf, rBaseURL);
- rOStm.WriteLine( aStr );
+ rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
{
- ByteString aStr( "circle " );
+ rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
- AppendNCSAURL( aStr, rBaseURL );
- AppendNCSACoords( aCenter, aStr );
- AppendNCSACoords( aCenter + Point( nRadius, 0 ), aStr );
+ AppendNCSAURL(aStrBuf, rBaseURL);
+ AppendNCSACoords(aStrBuf, aCenter);
+ AppendNCSACoords(aStrBuf, aCenter + Point(nRadius, 0));
- rOStm.WriteLine( aStr );
+ rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-
-/******************************************************************************/
-/******************************************************************************/
-
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
{
- ByteString aStr( "polygon " );
- const sal_uInt16 nCount = aPoly.GetSize();
+ rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon "));
+ const sal_uInt16 nCount = aPoly.GetSize();
- for ( sal_uInt16 i = 0; i < nCount; i++ )
- AppendCERNCoords( aPoly[ i ], aStr );
+ for (sal_uInt16 i = 0; i < nCount; ++i)
+ AppendCERNCoords(aStrBuf, aPoly[i]);
- AppendCERNURL( aStr, rBaseURL );
+ AppendCERNURL(aStrBuf, rBaseURL);
- rOStm.WriteLine( aStr );
+ rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
{
- ByteString aStr( "poly " );
- const sal_uInt16 nCount = Min( aPoly.GetSize(), (sal_uInt16) 100 );
+ rtl::OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly "));
+ const sal_uInt16 nCount = Min( aPoly.GetSize(), (sal_uInt16) 100 );
- AppendNCSAURL( aStr, rBaseURL );
+ AppendNCSAURL(aStrBuf, rBaseURL);
- for ( sal_uInt16 i = 0; i < nCount; i++ )
- AppendNCSACoords( aPoly[ i ], aStr );
+ for (sal_uInt16 i = 0; i < nCount; ++i)
+ AppendNCSACoords(aStrBuf, aPoly[i]);
- rOStm.WriteLine( aStr );
+ rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-
-/******************************************************************************/
-/******************************************************************************/
-
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const
{
switch( nFormat )
@@ -264,13 +166,6 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL
}
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
{
IMapObject* pObj;
@@ -300,13 +195,6 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
}
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
{
IMapObject* pObj;
@@ -336,13 +224,6 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
}
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL )
{
sal_uLong nRet = IMAP_ERR_FORMAT;
@@ -366,13 +247,6 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBas
return nRet;
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
{
ByteString aStr;
@@ -386,13 +260,6 @@ sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
return IMAP_ERR_OK;
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL )
{
ByteString aStr( rLine );
@@ -451,13 +318,6 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL
}
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
Point ImageMap::ImpReadCERNCoords( const char** ppStr )
{
String aStrX;
@@ -498,13 +358,6 @@ Point ImageMap::ImpReadCERNCoords( const char** ppStr )
return aPt;
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
long ImageMap::ImpReadCERNRadius( const char** ppStr )
{
String aStr;
@@ -525,13 +378,6 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr )
return aStr.ToInt32();
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
{
String aStr( String::CreateFromAscii( *ppStr ) );
@@ -544,13 +390,6 @@ String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
return INetURLObject::GetAbsURL( rBaseURL, aStr );
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
{
ByteString aStr;
@@ -564,13 +403,6 @@ sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
return IMAP_ERR_OK;
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL )
{
ByteString aStr( rLine );
@@ -629,13 +461,6 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL
}
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL )
{
String aStr;
@@ -656,13 +481,6 @@ String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL )
return INetURLObject::GetAbsURL( rBaseURL, aStr );
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
Point ImageMap::ImpReadNCSACoords( const char** ppStr )
{
String aStrX;
@@ -699,13 +517,6 @@ Point ImageMap::ImpReadNCSACoords( const char** ppStr )
return aPt;
}
-
-/******************************************************************************
-|*
-|*
-|*
-\******************************************************************************/
-
sal_uLong ImageMap::ImpDetectFormat( SvStream& rIStm )
{
sal_uLong nPos = rIStm.Tell();
commit f6ec57136408aaf57b4b3a68523d33162e91c021
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 21 03:19:23 2011 +0300
Do depend on rsc always, we include rscsfx.hxx delivered from there
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index 5fc7d0e..2e01ff6 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,3 +1,3 @@
-sl svl : TRANSLATIONS:translations DESKTOP:rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
+sl svl : TRANSLATIONS:translations rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
sl svl\prj nmake - all svl_prj NULL
# sl svl\qa\unit nmake - all svl_qa_cppunit svl_util NULL
commit 9ac38e5dfd02b571814ceceec35a8f71848c70e2
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Jun 21 03:07:58 2011 +0300
Mark l10ntools for DESKTOP builds only
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 6db5d66..646a455 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools l10ntools icc cpputools svl LIBXSLT:libxslt NULL
+vc vcl : TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools svl LIBXSLT:libxslt NULL
vc vcl usr1 - all vc_mkout NULL
vc vcl\prj nmake - all vc_prj NULL
commit 91b2ecbe0c6cb4509deb79ee978116c7976d933b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 02:47:53 2011 +0300
Fix for cross-compiling with MinGW
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index 4668785..c93a3f3 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -36,7 +36,7 @@ LIBTARGET=NO
debug!=
.ENDIF
-.IF "$(OS)" == "WNT"
+.IF "$(OS_FOR_BUILD)" == "WNT"
my_file = file:///
.ELSE
my_file = file://
@@ -326,12 +326,20 @@ MY_MISC_CXXFILES := $(foreach,i,$(DEPOBJFILES) $(MISC)/$(i:b).cxx)
.INCLUDE : target.mk
-$(MY_MISC_CXXFILES) : $(OUT_FOR_BUILD)$/bin$/saxparser$(EXECPOST) $(MISC)/saxparser.rdb
+$(MY_MISC_CXXFILES) : $(OUT_FOR_BUILD)$/bin$/saxparser$(EXECPOST_FOR_BUILD) $(MISC)/saxparser.rdb
+
+.IF "$(CROSS_COMPILING)" == "YES"
+# Always cross-compiling from some Unix,
+# so the BUILD platform's lib directory is correct
+sharedlibdir=$(SOLARLIBDIR_FOR_BUILD)
+.ELSE
+sharedlibdir=$(SOLARSHAREDBIN)
+.ENDIF
$(MISC)$/localedata_%.cxx : %.xml
$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(OUT_FOR_BUILD)$/bin$/saxparser $* $< $@ \
$(my_file)$(PWD)/$(MISC_FOR_BUILD)/saxparser.rdb $(SOLARBINDIR)$/types.rdb \
- -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(SOLARSHAREDBIN)
+ -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(sharedlibdir)
$(RM) $(BIN)$/$(@:b).rdb
$(MISC)/saxparser.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
commit 92d9e7de41a54b8691e39c9cd60bc5ce6cdab75e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 02:29:08 2011 +0300
Use the import library name that i18npool expects with MinGW
diff --git a/regexp/prj/d.lst b/regexp/prj/d.lst
index fadeaf7..0408e36 100644
--- a/regexp/prj/d.lst
+++ b/regexp/prj/d.lst
@@ -5,4 +5,5 @@ mkdir: %_DEST%\inc\external\regexp
..\%__SRC%\bin\i18nrege*.dll %_DEST%\bin\i18nrege*.dll
..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib\libi18nregexp*.so
..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib\libi18nregexp*.dylib
+..\%__SRC%\lib\libi18nregexp*.dll.a %_DEST%\lib\libi18nregexp*.dll.a
..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib\ii18nregexp.lib
diff --git a/regexp/source/makefile.mk b/regexp/source/makefile.mk
index 7aa2a2e..b1ebf69 100644
--- a/regexp/source/makefile.mk
+++ b/regexp/source/makefile.mk
@@ -44,7 +44,11 @@ SLOFILES= \
$(EXCEPTIONSFILES)
SHL1TARGET= $(TARGET)$(COMID)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB = $(TARGET)$(COMID)
+.ENDIF
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
commit 8455a101cde43b4902fb71bc84676f625c2a52d9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 02:24:39 2011 +0300
Use MSVC-specific compiler options only when $(COM)==MSC
diff --git a/i18npool/source/breakiterator/data/makefile.mk b/i18npool/source/breakiterator/data/makefile.mk
index 81bbbbd..572446a 100644
--- a/i18npool/source/breakiterator/data/makefile.mk
+++ b/i18npool/source/breakiterator/data/makefile.mk
@@ -34,7 +34,7 @@ LIBTARGET=NO
.INCLUDE : settings.mk
# Fix heap limit problem on MSC
-.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
.IF "$(COMEX)" != "8"
CDEFS+=-Zm300
.ENDIF
diff --git a/i18npool/source/collator/data/makefile.mk b/i18npool/source/collator/data/makefile.mk
index 59eb1a5..920e506 100644
--- a/i18npool/source/collator/data/makefile.mk
+++ b/i18npool/source/collator/data/makefile.mk
@@ -33,7 +33,7 @@ TARGET=collator_data
.INCLUDE : settings.mk
# Fix heap limit problem on MSC
-.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
.IF "$(COMEX)" != "8"
CDEFS+=-Zm300
.ENDIF
diff --git a/i18npool/source/indexentry/data/makefile.mk b/i18npool/source/indexentry/data/makefile.mk
index 42378da..84d4281 100644
--- a/i18npool/source/indexentry/data/makefile.mk
+++ b/i18npool/source/indexentry/data/makefile.mk
@@ -34,7 +34,7 @@ LIBTARGET=NO
.INCLUDE : settings.mk
# Fix heap limit problem on MSC
-.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
.IF "$(COMEX)" != "8"
CDEFS+=-Zm300
.ENDIF
diff --git a/i18npool/source/textconversion/data/makefile.mk b/i18npool/source/textconversion/data/makefile.mk
index 967b4f9..6f54d20 100644
--- a/i18npool/source/textconversion/data/makefile.mk
+++ b/i18npool/source/textconversion/data/makefile.mk
@@ -34,7 +34,7 @@ LIBTARGET=NO
.INCLUDE : settings.mk
# Fix heap limit problem on MSC
-.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
.IF "$(COMEX)" != "8"
CDEFS+=-Zm300
.ENDIF
commit 4e9b36a3760f667e2b9ba33830d229f14543f08d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jun 20 22:49:40 2011 +0300
Make the MinGW import library name match what libs.mk wants
Use the i prefix only for import libraries built with MSC. Add COMID
to the import library built with MinGW. This matches the shared
library name on Unix, and MinGW is a Unix-style compiler.
diff --git a/i18nutil/source/utility/makefile.mk b/i18nutil/source/utility/makefile.mk
index adfddd9..cece284 100644
--- a/i18nutil/source/utility/makefile.mk
+++ b/i18nutil/source/utility/makefile.mk
@@ -47,7 +47,11 @@ SLOFILES= \
# Unicode utilities
SHL1TARGET= $(TARGET)$(COMID)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)$(COMID)
+.ENDIF
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
commit b58510105ee05b6149bf01381d43802e926eea59
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jun 20 22:45:09 2011 +0300
Don't use the i prefix for import libraries with WNTGCC
diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk
index 6e1348c..a0f1771 100644
--- a/sax/source/expatwrap/makefile.mk
+++ b/sax/source/expatwrap/makefile.mk
@@ -54,7 +54,11 @@ SLOFILES =\
$(SLO)$/saxwriter.obj
SHL1TARGET= $(TARGET)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)
+.ENDIF
SHL1STDLIBS= \
$(SALLIB) \
diff --git a/sax/source/fastparser/makefile.mk b/sax/source/fastparser/makefile.mk
index d8f9378..9690ffa 100644
--- a/sax/source/fastparser/makefile.mk
+++ b/sax/source/fastparser/makefile.mk
@@ -51,7 +51,11 @@ SLOFILES =\
$(SLO)$/xml2utf.obj
SHL1TARGET= $(TARGET)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)
+.ENDIF
SHL1STDLIBS= \
$(SALLIB) \
diff --git a/sax/source/tools/makefile.mk b/sax/source/tools/makefile.mk
index 5923fc5..abece06 100644
--- a/sax/source/tools/makefile.mk
+++ b/sax/source/tools/makefile.mk
@@ -45,7 +45,11 @@ SLOFILES = \
$(SLO)$/fshelper.obj
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)$(DLLPOSTFIX)
+.ENDIF
SHL1STDLIBS= \
$(CPPULIB) \
commit 9c8e033410602a421f9fd370db320e683c851aeb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jun 20 22:40:52 2011 +0300
This file is not used
diff --git a/sax/util/makefile.mk b/sax/util/makefile.mk
deleted file mode 100644
index 8875e38..0000000
--- a/sax/util/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=sax
-TARGET=sax
-
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=\
- $(SLB)$/saxtools.lib
-
-# sax
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-SHL1USE_EXPORTS=name
-
-SHL1LIBS= $(LIB1TARGET)
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB)\
- $(COMPHELPERLIB)\
- $(RTLLIB) \
- $(SALLIB) \
- $(ONELIB) \
- $(SALHELPERLIB)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
commit e799a358c9d56376eaf768ffc255d059d58981b3
Author: Jesús Corrius <jesus at softcatala.org>
Date: Mon Jun 20 22:21:13 2011 +0200
Avoid possible null pointer dereference
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 9f72bb6..7b8239f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5239,7 +5239,11 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam )
// Feststellen, ob wir IME unterstuetzen
WinSalFrame* pFrame = GetWindowPtr( hWnd );
- if ( pFrame && pFrame->mbIME && pFrame->mhDefIMEContext )
+
+ if ( !pFrame )
+ return;
+
+ if ( pFrame->mbIME && pFrame->mhDefIMEContext )
{
HKL hKL = (HKL)lParam;
UINT nImeProps = ImmGetProperty( hKL, IGP_PROPERTY );
commit 37586dc6699cfac775f33d213e96625ed3f33247
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Jun 20 17:08:12 2011 +0200
add missing newline to the end of file to silence the compiler
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 40602b8..a45b05b 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -574,4 +574,4 @@ public:
#endif // _GRFMGR_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index be9037c..eaf86cb 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -1512,4 +1512,4 @@ IMPL_LINK( ExportDialog, OK, void *, EMPTYARG )
return 0;
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/filter/filter2.cxx b/svtools/source/filter/filter2.cxx
index cd89c2f..5a42b8b 100644
--- a/svtools/source/filter/filter2.cxx
+++ b/svtools/source/filter/filter2.cxx
@@ -1352,4 +1352,4 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
return String( aKeyName, RTL_TEXTENCODING_ASCII_US );
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 09127c0..15de989 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1232,4 +1232,4 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 320435a..d1a6205 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -2384,4 +2384,4 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx,
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index 87eecfb..0320802 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -291,4 +291,4 @@ MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererSe
#endif // _SV_GDIMTF_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index bffd8e6..c8b7516 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -222,4 +222,4 @@ public:
#endif // _SV_GRAPH_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/svgread.hxx b/vcl/inc/vcl/svgread.hxx
index 4427198..cf4f800 100644
--- a/vcl/inc/vcl/svgread.hxx
+++ b/vcl/inc/vcl/svgread.hxx
@@ -80,4 +80,4 @@ namespace vcl
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 1e94535..a2268ab 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -4409,4 +4409,4 @@ void MetaRenderGraphicAction::Read( SvStream& rIStm, ImplMetaReadData* )
rIStm >> maRenderGraphic >> maPoint >> maSize >> mfRotateAngle >> mfShearAngleX >> mfShearAngleY;
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1ef047422f3f8fce5b53d8dbfeb30bd6216150b9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 18 00:55:38 2011 +0100
catch by const reference
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 809c5ba..ba56773 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -165,7 +165,7 @@ DefaultFontConfiguration::DefaultFontConfiguration()
}
}
}
- catch( Exception& )
+ catch (const Exception&)
{
// configuration is awry
m_xConfigProvider.clear();
@@ -173,7 +173,7 @@ DefaultFontConfiguration::DefaultFontConfiguration()
}
}
}
- catch( WrappedTargetException& )
+ catch (const WrappedTargetException&)
{
}
#if OSL_DEBUG_LEVEL > 1
@@ -214,10 +214,10 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr
it->second.xAccess = xNode;
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
}
@@ -231,10 +231,10 @@ OUString DefaultFontConfiguration::tryLocale( const Locale& rLocale, const OUStr
aAny >>= aRet;
}
}
- catch( NoSuchElementException& )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException& )
+ catch (const WrappedTargetException&)
{
}
}
@@ -451,7 +451,7 @@ FontSubstConfiguration::FontSubstConfiguration() :
}
}
}
- catch( Exception& )
+ catch (const Exception&)
{
// configuration is awry
m_xConfigProvider.clear();
@@ -459,7 +459,7 @@ FontSubstConfiguration::FontSubstConfiguration() :
}
}
}
- catch( WrappedTargetException& )
+ catch (const WrappedTargetException&)
{
}
#if OSL_DEBUG_LEVEL > 1
@@ -994,10 +994,10 @@ void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Referen
}
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
}
@@ -1025,10 +1025,10 @@ FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Re
#endif
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
return (FontWeight)( weight >= 0 ? pWeightNames[weight].nEnum : WEIGHT_DONTKNOW );
@@ -1057,10 +1057,10 @@ FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Refe
#endif
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
return (FontWidth)( width >= 0 ? pWidthNames[width].nEnum : WIDTH_DONTKNOW );
@@ -1092,10 +1092,10 @@ unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::R
}
}
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
@@ -1117,10 +1117,10 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale
Any aAny = m_xConfigAccess->getByName( it->second.aConfigLocaleString );
aAny >>= xNode;
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
if( xNode.is() )
@@ -1147,10 +1147,10 @@ void FontSubstConfiguration::readLocaleSubst( const com::sun::star::lang::Locale
Any aAny = xNode->getByName( pFontNames[i] );
aAny >>= xFont;
}
- catch( NoSuchElementException )
+ catch (const NoSuchElementException&)
{
}
- catch( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
if( ! xFont.is() )
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index a2d60d7..20a22f3 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -696,7 +696,7 @@ Moderator::Result Moderator::getResult(const sal_uInt32 milliSec)
// reset
m_aResultType = NORESULT;
}
- catch(const salhelper::ConditionWaiter::timedout&)
+ catch (const salhelper::ConditionWaiter::timedout&)
{
ret.type = TIMEDOUT;
}
@@ -849,24 +849,24 @@ void SAL_CALL Moderator::run()
aResult = m_aContent.executeCommand(m_aArg.Name,m_aArg.Argument);
aResultType = RESULT;
}
- catch ( CommandAbortedException )
+ catch (const CommandAbortedException&)
{
aResultType = COMMANDABORTED;
}
- catch ( CommandFailedException )
+ catch (const CommandFailedException&)
{
aResultType = COMMANDFAILED;
}
- catch ( InteractiveIOException& r )
+ catch (const InteractiveIOException& r)
{
nIOErrorCode = r.Code;
aResultType = INTERACTIVEIO;
}
- catch ( UnsupportedDataSinkException& )
+ catch (const UnsupportedDataSinkException )
{
aResultType = UNSUPPORTED;
}
- catch ( Exception )
+ catch (const Exception&)
{
aResultType = GENERAL;
}
@@ -950,10 +950,13 @@ static sal_Bool UCBOpenContentSync(
bool bResultAchieved(false);
Moderator* pMod = 0;
- try {
+ try
+ {
pMod = new Moderator(xContent,xInteract,xProgress,rArg);
pMod->create();
- } catch(const ContentCreationException&) {
+ }
+ catch (const ContentCreationException&)
+ {
bResultAchieved = bException = true;
xLockBytes->SetError( ERRCODE_IO_GENERAL );
}
@@ -1180,17 +1183,17 @@ static sal_Bool _UCBOpenContentSync(
{
aResult = aContent.executeCommand( rArg.Name, rArg.Argument );
}
- catch ( CommandAbortedException )
+ catch (const CommandAbortedException&)
{
bAborted = true;
xLockBytes->SetError( ERRCODE_ABORT );
}
- catch ( CommandFailedException )
+ catch (const CommandFailedException&)
{
bAborted = true;
xLockBytes->SetError( ERRCODE_ABORT );
}
- catch ( InteractiveIOException& r )
+ catch (const InteractiveIOException& r)
{
bException = true;
if ( r.Code == IOErrorCode_ACCESS_DENIED || r.Code == IOErrorCode_LOCKING_VIOLATION )
@@ -1202,12 +1205,12 @@ static sal_Bool _UCBOpenContentSync(
else
xLockBytes->SetError( ERRCODE_IO_GENERAL );
}
- catch ( UnsupportedDataSinkException& )
+ catch (const UnsupportedDataSinkException&)
{
bException = true;
xLockBytes->SetError( ERRCODE_IO_NOTSUPPORTED );
}
- catch ( Exception )
+ catch (const Exception&)
{
bException = true;
xLockBytes->SetError( ERRCODE_IO_GENERAL );
@@ -1262,10 +1265,12 @@ UcbLockBytes::~UcbLockBytes()
{
m_xInputStream->closeInput();
}
- catch ( RuntimeException const & )
- {}
- catch ( IOException const & )
- {}
+ catch (const RuntimeException&)
+ {
+ }
+ catch (const IOException&)
+ {
+ }
}
}
@@ -1275,10 +1280,12 @@ UcbLockBytes::~UcbLockBytes()
{
m_xOutputStream->closeOutput();
}
- catch ( RuntimeException const & )
- {}
- catch ( IOException const & )
- {}
+ catch (const RuntimeException&)
+ {
+ }
+ catch (const IOException&)
+ {
+ }
}
}
@@ -1352,8 +1359,9 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const Reference<XInputStream> &rxInp
bRet = m_xInputStream.is();
}
- catch( Exception& )
- {}
+ catch (const Exception&)
+ {
+ }
if ( m_bStreamValid && m_xInputStream.is() )
m_aInitialized.set();
@@ -1420,11 +1428,11 @@ ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount,
{
xSeekable->seek( nPos );
}
- catch ( IOException )
+ catch (const IOException&)
{
return ERRCODE_IO_CANTSEEK;
}
- catch (com::sun::star::lang::IllegalArgumentException)
+ catch (const com::sun::star::lang::IllegalArgumentException&)
{
return ERRCODE_IO_CANTSEEK;
}
@@ -1444,7 +1452,7 @@ ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount,
nSize = xStream->readBytes( aData, sal_Int32(nCount) );
}
- catch (IOException)
+ catch (const IOException&)
{
return ERRCODE_IO_CANTREAD;
}
@@ -1474,7 +1482,7 @@ ErrCode UcbLockBytes::WriteAt ( sal_uLong nPos, const void *pBuffer, sal_uLong n
{
xSeekable->seek( nPos );
}
- catch ( IOException )
+ catch (const IOException&)
{
return ERRCODE_IO_CANTSEEK;
}
@@ -1487,7 +1495,7 @@ ErrCode UcbLockBytes::WriteAt ( sal_uLong nPos, const void *pBuffer, sal_uLong n
if ( pWritten )
*pWritten = nCount;
}
- catch ( Exception )
+ catch (const Exception&)
{
return ERRCODE_IO_CANTWRITE;
}
@@ -1506,7 +1514,7 @@ ErrCode UcbLockBytes::Flush() const
{
xOutputStream->flush();
}
- catch( Exception )
+ catch (const Exception&)
{
return ERRCODE_IO_CANTWRITE;
}
@@ -1577,7 +1585,7 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
{
pStat->nSize = sal_uLong(xSeekable->getLength());
}
- catch (IOException)
+ catch (const IOException&)
{
return ERRCODE_IO_CANTTELL;
}
commit 31f3719fda91f7643c84dea08e61bc849e97d1eb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 18 00:49:02 2011 +0100
catch by const reference
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index a8d14d4..ef928e7 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -219,8 +219,7 @@ void SAL_CALL ClipboardManager::dispose()
xComponent->removeEventListener(static_cast < XEventListener * > (this));
xComponent->dispose();
}
-
- catch(Exception e)
+ catch (const Exception&)
{
// exceptions can be safely ignored here.
}
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 02ed79e..4b1976f 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -465,13 +465,13 @@ int SAL_CALL main( int argc, const char* argv[] )
xClipboardManager->getClipboard( OUString(RTL_CONSTASCII_USTRINGPARAM("generic")) );
TRACE( "FAILED\n" );
}
- catch( NoSuchElementException e )
+ catch (const NoSuchElementException&)
{
TRACE( "passed\n" );
}
}
- catch ( Exception aException )
+ catch (const Exception&)
{
ENSURE( sal_False, "*** ERROR *** exception caught." );
}
commit 7f1ec0e031874dfaefaabe08512d10e798f4c5da
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 18 00:47:37 2011 +0100
handle truncated stream
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index 2342de7..16379e4 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -71,7 +71,7 @@ LayoutRoot::~LayoutRoot()
m_refCount++; // inhibit multiple destruction
dispose();
}
- catch( uno::Exception& )
+ catch (const uno::Exception&)
{
}
}
@@ -186,7 +186,7 @@ void SAL_CALL LayoutRoot::initialize( const uno::Sequence< uno::Any >& aArgument
{
xParser->parseStream( source );
}
- catch ( xml::sax::SAXParseException& e )
+ catch (const xml::sax::SAXParseException& e)
{
OUString c(RTL_CONSTASCII_USTRINGPARAM(":"));
error( aXMLName
@@ -361,7 +361,7 @@ bool LayoutWidget::addChild( LayoutWidget *pChild )
{
mxContainer->addChild( pChild->mxWidget );
}
- catch( awt::MaxChildrenException ex )
+ catch (const awt::MaxChildrenException&)
{
return false;
}
commit 4feb462877f4cbc82623badd203e6a1f5955f890
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 18 00:07:43 2011 +0100
catch by const reference
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 4cbfff4..4b90d12 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -178,7 +178,7 @@ ErrCode SvOutputStreamOpenLockBytes::Flush() const
{
m_xOutputStream->flush();
}
- catch (io::IOException)
+ catch (const io::IOException&)
{
return ERRCODE_IO_CANTWRITE;
}
@@ -223,7 +223,7 @@ ErrCode SvOutputStreamOpenLockBytes::FillAppend(void const * pBuffer,
writeBytes(uno::Sequence< sal_Int8 >(
static_cast< sal_Int8 const * >(pBuffer), nCount));
}
- catch (io::IOException)
+ catch (const io::IOException&)
{
return ERRCODE_IO_CANTWRITE;
}
@@ -252,11 +252,15 @@ sal_uLong SvOutputStreamOpenLockBytes::Seek(sal_uLong)
void SvOutputStreamOpenLockBytes::Terminate()
{
if (m_xOutputStream.is())
+ {
try
{
m_xOutputStream->closeOutput();
}
- catch (io::IOException) {}
+ catch (const io::IOException&)
+ {
+ }
+ }
}
//============================================================================
@@ -492,7 +496,7 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize)
{
m_xSeekable->seek(m_nSeekedFrom);
}
- catch (io::IOException)
+ catch (const io::IOException&)
{
SetError(ERRCODE_IO_CANTREAD);
return 0;
@@ -513,7 +517,7 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize)
{
nCount = m_xStream->readBytes(aBuffer, nRemain);
}
- catch (io::IOException)
+ catch (const io::IOException&)
{
SetError(ERRCODE_IO_CANTREAD);
return nRead;
@@ -550,7 +554,7 @@ sal_uLong SvInputStream::GetData(void * pData, sal_uLong nSize)
{
nCount = m_xStream->readBytes(aBuffer, nRemain);
}
- catch (io::IOException)
+ catch (const io::IOException&)
{
SetError(ERRCODE_IO_CANTREAD);
break;
@@ -604,7 +608,9 @@ sal_uLong SvInputStream::SeekPos(sal_uLong nPos)
return sal_uLong(nLength);
}
}
- catch (io::IOException) {}
+ catch (const io::IOException&)
+ {
+ }
else
return Tell(); //@@@
}
@@ -617,13 +623,17 @@ sal_uLong SvInputStream::SeekPos(sal_uLong nPos)
return nPos;
}
else if (m_xSeekable.is())
+ {
try
{
m_xSeekable->seek(nPos);
m_nSeekedFrom = STREAM_SEEK_TO_END;
return nPos;
}
- catch (io::IOException) {}
+ catch (const io::IOException&)
+ {
+ }
+ }
else if (m_pPipe->setReadPosition(nPos) == SvDataPipe_Impl::SEEK_OK)
{
m_nSeekedFrom = STREAM_SEEK_TO_END;
@@ -658,11 +668,15 @@ SvInputStream::SvInputStream(
SvInputStream::~SvInputStream()
{
if (m_xStream.is())
+ {
try
{
m_xStream->closeInput();
}
- catch (io::IOException) {}
+ catch (const io::IOException&)
+ {
+ }
+ }
delete m_pPipe;
}
@@ -727,7 +741,7 @@ sal_uLong SvOutputStream::PutData(void const * pData, sal_uLong nSize)
+ nWritten,
nRemain));
}
- catch (io::IOException)
+ catch (const io::IOException&)
{
SetError(ERRCODE_IO_CANTWRITE);
break;
@@ -758,7 +772,9 @@ void SvOutputStream::FlushData()
{
m_xStream->flush();
}
- catch (io::IOException) {}
+ catch (const io::IOException&)
+ {
+ }
}
//============================================================================
@@ -781,11 +797,15 @@ SvOutputStream::SvOutputStream(uno::Reference< io::XOutputStream > const &
SvOutputStream::~SvOutputStream()
{
if (m_xStream.is())
+ {
try
{
m_xStream->closeOutput();
}
- catch (io::IOException) {}
+ catch (const io::IOException&)
+ {
+ }
+ }
}
//============================================================================
commit a3e812d9155bce43de4fe0a5383c7e681730ff16
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 18 00:01:50 2011 +0100
catch by const reference
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 02543f8..4f326a7 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -410,8 +410,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
return bSuccess;
}
-
- catch(::com::sun::star::java::JavaNotConfiguredException e)
+ catch (const ::com::sun::star::java::JavaNotConfiguredException&)
{
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
@@ -435,8 +434,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
return false;
}
-
- catch(::com::sun::star::java::JavaVMCreationFailureException e)
+ catch (const ::com::sun::star::java::JavaVMCreationFailureException&)
{
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
@@ -460,8 +458,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
return false;
}
-
- catch(::com::sun::star::java::MissingJavaRuntimeException e)
+ catch (const ::com::sun::star::java::MissingJavaRuntimeException&)
{
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
@@ -485,8 +482,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
return false;
}
-
- catch(::com::sun::star::java::JavaDisabledException e)
+ catch (const ::com::sun::star::java::JavaDisabledException&)
{
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && bAllowCancel && pResMgr )
@@ -510,9 +506,7 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
return false;
}
-
-
- catch(::com::sun::star::uno::RuntimeException e)
+ catch (const ::com::sun::star::uno::RuntimeException& e)
{
ResMgr *pResMgr = ImplGetResMgr();
if( bErrorMessage && pResMgr )
@@ -564,7 +558,6 @@ bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
return false;
}
-
catch (...)
{
return false;
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index c0c8743..f0bf248 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -250,7 +250,7 @@ static rtl::OUString queryFile( Printer* pPrinter )
// add arbitrary files
xFilterMgr->appendFilter( String( VclResId( SV_STDTEXT_ALLFILETYPES ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
}
- catch( lang::IllegalArgumentException )
+ catch (const lang::IllegalArgumentException&)
{
DBG_ERRORFILE( "caught IllegalArgumentException when registering filter\n" );
}
@@ -460,7 +460,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr
makeAny( sal_True ) );
}
}
- catch( std::bad_alloc& )
+ catch (const std::bad_alloc&)
{
}
}
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index 108dc3e..eb0b81a 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -193,8 +193,7 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop
nRet++;
}
}
-
- catch( RuntimeException )
+ catch (const RuntimeException&)
{
pContainer->removeInterface( xElement );
}
@@ -209,8 +208,7 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop
{
context->rejectDrop();
}
-
- catch( RuntimeException exc )
+ catch (const RuntimeException&)
{
}
}
@@ -253,8 +251,7 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent()
nRet++;
}
}
-
- catch( RuntimeException )
+ catch (const RuntimeException&)
{
pContainer->removeInterface( xElement );
}
@@ -305,8 +302,7 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget
nRet++;
}
}
-
- catch( RuntimeException )
+ catch (const RuntimeException&)
{
pContainer->removeInterface( xElement );
}
@@ -321,8 +317,7 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget
{
context->rejectDrag();
}
-
- catch( RuntimeException exc )
+ catch (const RuntimeException&)
{
}
}
@@ -373,8 +368,7 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge
nRet++;
}
}
-
- catch( RuntimeException )
+ catch (const RuntimeException&)
{
pContainer->removeInterface( xElement );
}
@@ -389,8 +383,7 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge
{
context->rejectDrag();
}
-
- catch( RuntimeException exc )
+ catch (const RuntimeException&)
{
}
}
@@ -440,8 +433,7 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD
nRet++;
}
}
-
- catch( RuntimeException )
+ catch (const RuntimeException&)
{
pContainer->removeInterface( xElement );
}
@@ -456,8 +448,7 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD
{
context->rejectDrag();
}
-
- catch( RuntimeException exc )
+ catch (const RuntimeException&)
{
}
}
@@ -502,8 +493,7 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_
nRet++;
}
}
-
- catch( RuntimeException )
+ catch (const RuntimeException&)
{
pContainer->removeInterface( xElement );
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a694cfe..bc9b070 100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4340,8 +4340,7 @@ Window::~Window()
if( xComponent.is() )
xComponent->dispose();
}
-
- catch ( Exception )
+ catch (const Exception&)
{
// can be safely ignored here.
}
@@ -8378,8 +8377,7 @@ uno::Reference< XDropTarget > Window::GetDropTarget()
mpWindowImpl->mpFrameData->mbInternalDragGestureRecognizer = sal_True;
}
-
- catch( RuntimeException )
+ catch (const RuntimeException&)
{
// release all instances
mpWindowImpl->mpFrameData->mxDropTarget.clear();
@@ -8452,7 +8450,7 @@ uno::Reference< XDragSource > Window::GetDragSource()
}
// createInstance can throw any exception
- catch( Exception )
+ catch (const Exception&)
{
// release all instances
mpWindowImpl->mpFrameData->mxDropTarget.clear();
@@ -8532,7 +8530,7 @@ uno::Reference< XClipboard > Window::GetClipboard()
}
// createInstance can throw any exception
- catch( Exception )
+ catch (const Exception&)
{
// release all instances
mpWindowImpl->mpFrameData->mxClipboard.clear();
@@ -8584,7 +8582,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
}
// createInstance can throw any exception
- catch( Exception )
+ catch (const Exception&)
{
// release all instances
mpWindowImpl->mpFrameData->mxSelection.clear();
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index b50fb5a..3f741ff 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -224,7 +224,7 @@ void DocumentFocusListener::notifyEvent( const accessibility::AccessibleEventObj
if( accessibility::AccessibleStateType::FOCUSED == nState )
atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
}
- catch(const lang::IndexOutOfBoundsException &e)
+ catch (const lang::IndexOutOfBoundsException&)
{
g_warning("Focused object has invalid index in parent");
}
@@ -559,7 +559,7 @@ static void handle_get_focus(::VclWindowEvent const * pEvent)
{
aDocumentFocusListener->attachRecursive(xAccessible, xContext, xStateSet);
}
- catch( const uno::Exception &e )
+ catch (const uno::Exception&)
{
g_warning( "Exception caught processing focus events" );
}
@@ -593,7 +593,7 @@ static void handle_menu_highlighted(::VclMenuEvent const * pEvent)
}
}
}
- catch( const uno::Exception& e )
+ catch (const uno::Exception&)
{
g_warning( "Exception caught processing menu highlight events" );
}
@@ -603,74 +603,76 @@ static void handle_menu_highlighted(::VclMenuEvent const * pEvent)
long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
{
- try {
- switch (pEvent->GetId())
+ try
{
- case VCLEVENT_WINDOW_SHOW:
- break;
- case VCLEVENT_WINDOW_HIDE:
- break;
- case VCLEVENT_WINDOW_CLOSE:
- break;
- case VCLEVENT_WINDOW_GETFOCUS:
- handle_get_focus(static_cast< ::VclWindowEvent const * >(pEvent));
- break;
- case VCLEVENT_WINDOW_LOSEFOCUS:
- break;
- case VCLEVENT_WINDOW_MINIMIZE:
- break;
- case VCLEVENT_WINDOW_NORMALIZE:
- break;
- case VCLEVENT_WINDOW_KEYINPUT:
- case VCLEVENT_WINDOW_KEYUP:
- case VCLEVENT_WINDOW_COMMAND:
- case VCLEVENT_WINDOW_MOUSEMOVE:
- break;
-
- case VCLEVENT_MENU_HIGHLIGHT:
- if (const VclMenuEvent* pMenuEvent = dynamic_cast<const VclMenuEvent*>(pEvent))
- {
- handle_menu_highlighted(pMenuEvent);
- }
- else if (const VclAccessibleEvent* pAccEvent = dynamic_cast<const VclAccessibleEvent*>(pEvent))
+ switch (pEvent->GetId())
{
- uno::Reference< accessibility::XAccessible > xAccessible = pAccEvent->GetAccessible();
- if (xAccessible.is())
- atk_wrapper_focus_tracker_notify_when_idle(xAccessible);
+ case VCLEVENT_WINDOW_SHOW:
+ break;
+ case VCLEVENT_WINDOW_HIDE:
+ break;
+ case VCLEVENT_WINDOW_CLOSE:
+ break;
+ case VCLEVENT_WINDOW_GETFOCUS:
+ handle_get_focus(static_cast< ::VclWindowEvent const * >(pEvent));
+ break;
+ case VCLEVENT_WINDOW_LOSEFOCUS:
+ break;
+ case VCLEVENT_WINDOW_MINIMIZE:
+ break;
+ case VCLEVENT_WINDOW_NORMALIZE:
+ break;
+ case VCLEVENT_WINDOW_KEYINPUT:
+ case VCLEVENT_WINDOW_KEYUP:
+ case VCLEVENT_WINDOW_COMMAND:
+ case VCLEVENT_WINDOW_MOUSEMOVE:
+ break;
+
+ case VCLEVENT_MENU_HIGHLIGHT:
+ if (const VclMenuEvent* pMenuEvent = dynamic_cast<const VclMenuEvent*>(pEvent))
+ {
+ handle_menu_highlighted(pMenuEvent);
+ }
+ else if (const VclAccessibleEvent* pAccEvent = dynamic_cast<const VclAccessibleEvent*>(pEvent))
+ {
+ uno::Reference< accessibility::XAccessible > xAccessible = pAccEvent->GetAccessible();
+ if (xAccessible.is())
+ atk_wrapper_focus_tracker_notify_when_idle(xAccessible);
+ }
+ break;
+
+ case VCLEVENT_TOOLBOX_HIGHLIGHT:
+ handle_toolbox_highlight(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
+ break;
+
+ case VCLEVENT_TOOLBOX_BUTTONSTATECHANGED:
+ handle_toolbox_buttonchange(static_cast< ::VclWindowEvent const * >(pEvent));
+ break;
+
+ case VCLEVENT_OBJECT_DYING:
+ g_aWindowList.erase( static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow() );
+ // fallthrough intentional !
+ case VCLEVENT_TOOLBOX_HIGHLIGHTOFF:
+ handle_toolbox_highlightoff(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
+ break;
+
+ case VCLEVENT_TABPAGE_ACTIVATE:
+ handle_tabpage_activated(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
+ break;
+
+ case VCLEVENT_COMBOBOX_SETTEXT:
+ // This looks quite strange to me. Stumbled over this when fixing #i104290#.
+ // This kicked in when leaving the combobox in the toolbar, after that the events worked.
+ // I guess this was a try to work around missing combobox events, which didn't do the full job, and shouldn't be necessary anymore.
+ // Fix for #i104290# was done in toolkit/source/awt/vclxaccessiblecomponent, FOCUSED state for compound controls in general.
+ // create_wrapper_for_children(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
+ break;
+
+ default:
+ break;
}
- break;
-
- case VCLEVENT_TOOLBOX_HIGHLIGHT:
- handle_toolbox_highlight(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
- break;
-
- case VCLEVENT_TOOLBOX_BUTTONSTATECHANGED:
- handle_toolbox_buttonchange(static_cast< ::VclWindowEvent const * >(pEvent));
- break;
-
- case VCLEVENT_OBJECT_DYING:
- g_aWindowList.erase( static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow() );
- // fallthrough intentional !
- case VCLEVENT_TOOLBOX_HIGHLIGHTOFF:
- handle_toolbox_highlightoff(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
- break;
-
- case VCLEVENT_TABPAGE_ACTIVATE:
- handle_tabpage_activated(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
- break;
-
- case VCLEVENT_COMBOBOX_SETTEXT:
- // This looks quite strange to me. Stumbled over this when fixing #i104290#.
- // This kicked in when leaving the combobox in the toolbar, after that the events worked.
- // I guess this was a try to work around missing combobox events, which didn't do the full job, and shouldn't be necessary anymore.
- // Fix for #i104290# was done in toolkit/source/awt/vclxaccessiblecomponent, FOCUSED state for compound controls in general.
- // create_wrapper_for_children(static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
- break;
-
- default:
- break;
}
- } catch(lang::IndexOutOfBoundsException)
+ catch (const lang::IndexOutOfBoundsException&)
{
g_warning("Focused object has invalid index in parent");
}
commit 064f98d91baa9706f49b7f1ac33d85126c5d42b5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 17 23:52:59 2011 +0100
catch by const reference
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index cedc6d3..2c61acb 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -221,10 +221,10 @@ class PropertyValues : public PropertyValuesVector {};
m_bWasNull = sal_False; \
} \
} \
- catch ( IllegalArgumentException ) \
+ catch (const IllegalArgumentException&) \
{ \
} \
- catch ( CannotConvertException ) \
+ catch (const CannotConvertException&) \
{ \
} \
} \
@@ -881,10 +881,10 @@ void PropertyValueSet::appendPropertySet(
if ( aValue.hasValue() )
appendObject( rProp, aValue );
}
- catch ( UnknownPropertyException )
+ catch (const UnknownPropertyException&)
{
}
- catch ( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
}
@@ -909,10 +909,10 @@ sal_Bool PropertyValueSet::appendPropertySetValue(
return sal_True;
}
}
- catch ( UnknownPropertyException )
+ catch (const UnknownPropertyException&)
{
}
- catch ( WrappedTargetException )
+ catch (const WrappedTargetException&)
{
}
}
commit 73b71dba2544fb53c7dcafa895018b797fa7ed42
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jun 17 21:39:12 2011 +0100
silence unhelpful assert
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 3709166..30851e1 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -388,13 +388,12 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
- sal_Int32 nProperty = 0;
-
- for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
+ for(sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nInvalid property value for property detected!\n" );
+ if (seqValues[nProperty].hasValue()==sal_False)
+ continue;
switch( nProperty )
{
commit b8057daa93557ffba5d5d7a91eb6277c7f2789cf
Author: Jesús Corrius <jesus at softcatala.org>
Date: Sat Jun 18 18:36:57 2011 +0200
Remove obsolete Win95/NT code
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 3dbeeac..9f72bb6 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -232,9 +232,6 @@ static void ImplSaveFrameState( WinSalFrame* pFrame )
// if pParentRect is set, the workarea of the monitor that contains pParentRect is returned
void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect )
{
- static int winVerChecked = 0;
- static int winVerOk = 0;
-
// check if we or our parent is fullscreen, then the taskbar should be ignored
bool bIgnoreTaskbar = false;
WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -254,96 +251,64 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect )
}
}
- if( !winVerChecked )
+ // calculates the work area taking multiple monitors into account
+ static int nMonitors = GetSystemMetrics( SM_CMONITORS );
+ if( nMonitors == 1 )
{
- winVerChecked = 1;
- winVerOk = 1;
-
- // multi monitor calls not available on Win95/NT
- if ( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
- {
- if ( aSalShlData.maVersionInfo.dwMajorVersion <= 4 )
- winVerOk = 0; // NT
- }
- else if( aSalShlData.maVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
+ if( bIgnoreTaskbar )
{
- if ( aSalShlData.maVersionInfo.dwMajorVersion == 4 && aSalShlData.maVersionInfo.dwMinorVersion == 0 )
- winVerOk = 0; // Win95
+ pRect->left = pRect->top = 0;
+ pRect->right = GetSystemMetrics( SM_CXSCREEN );
+ pRect->bottom = GetSystemMetrics( SM_CYSCREEN );
}
+ else
+ SystemParametersInfo( SPI_GETWORKAREA, 0, pRect, 0 );
}
-
- // calculates the work area taking multiple monitors into account
- if( winVerOk )
+ else
{
- static int nMonitors = GetSystemMetrics( SM_CMONITORS );
- if( nMonitors == 1 )
+ if( pParentRect != NULL )
{
- if( bIgnoreTaskbar )
- {
- pRect->left = pRect->top = 0;
- pRect->right = GetSystemMetrics( SM_CXSCREEN );
- pRect->bottom = GetSystemMetrics( SM_CYSCREEN );
- }
+ // return the size of the monitor where pParentRect lives
+ HMONITOR hMonitor;
+ MONITORINFO mi;
+
+ // get the nearest monitor to the passed rect.
+ hMonitor = MonitorFromRect(pParentRect, MONITOR_DEFAULTTONEAREST);
+
+ // get the work area or entire monitor rect.
+ mi.cbSize = sizeof(mi);
+ GetMonitorInfo(hMonitor, &mi);
+ if( !bIgnoreTaskbar )
+ *pRect = mi.rcWork;
else
- SystemParametersInfo( SPI_GETWORKAREA, 0, pRect, 0 );
+ *pRect = mi.rcMonitor;
}
else
{
- if( pParentRect != NULL )
+ // return the union of all monitors
+ pRect->left = GetSystemMetrics( SM_XVIRTUALSCREEN );
+ pRect->top = GetSystemMetrics( SM_YVIRTUALSCREEN );
+ pRect->right = pRect->left + GetSystemMetrics( SM_CXVIRTUALSCREEN );
+ pRect->bottom = pRect->top + GetSystemMetrics( SM_CYVIRTUALSCREEN );
+
+ // virtualscreen does not take taskbar into account, so use the corresponding
+ // diffs between screen and workarea from the default screen
+ // however, this is still not perfect: the taskbar might not be on the primary screen
+ if( !bIgnoreTaskbar )
{
- // return the size of the monitor where pParentRect lives
- HMONITOR hMonitor;
- MONITORINFO mi;
-
- // get the nearest monitor to the passed rect.
- hMonitor = MonitorFromRect(pParentRect, MONITOR_DEFAULTTONEAREST);
-
- // get the work area or entire monitor rect.
- mi.cbSize = sizeof(mi);
- GetMonitorInfo(hMonitor, &mi);
- if( !bIgnoreTaskbar )
- *pRect = mi.rcWork;
- else
- *pRect = mi.rcMonitor;
+ RECT wRect, scrRect;
+ SystemParametersInfo( SPI_GETWORKAREA, 0, &wRect, 0 );
+ scrRect.left = 0;
+ scrRect.top = 0;
+ scrRect.right = GetSystemMetrics( SM_CXSCREEN );
+ scrRect.bottom = GetSystemMetrics( SM_CYSCREEN );
+
+ pRect->left += wRect.left;
+ pRect->top += wRect.top;
+ pRect->right -= scrRect.right - wRect.right;
+ pRect->bottom -= scrRect.bottom - wRect.bottom;
}
- else
- {
- // return the union of all monitors
- pRect->left = GetSystemMetrics( SM_XVIRTUALSCREEN );
- pRect->top = GetSystemMetrics( SM_YVIRTUALSCREEN );
- pRect->right = pRect->left + GetSystemMetrics( SM_CXVIRTUALSCREEN );
- pRect->bottom = pRect->top + GetSystemMetrics( SM_CYVIRTUALSCREEN );
-
- // virtualscreen does not take taskbar into account, so use the corresponding
- // diffs between screen and workarea from the default screen
- // however, this is still not perfect: the taskbar might not be on the primary screen
- if( !bIgnoreTaskbar )
- {
- RECT wRect, scrRect;
- SystemParametersInfo( SPI_GETWORKAREA, 0, &wRect, 0 );
- scrRect.left = 0;
- scrRect.top = 0;
- scrRect.right = GetSystemMetrics( SM_CXSCREEN );
- scrRect.bottom = GetSystemMetrics( SM_CYSCREEN );
-
- pRect->left += wRect.left;
- pRect->top += wRect.top;
- pRect->right -= scrRect.right - wRect.right;
- pRect->bottom -= scrRect.bottom - wRect.bottom;
- }
- }
- }
- }
- else
- {
- if( bIgnoreTaskbar )
- {
- pRect->left = pRect->top = 0;
- pRect->right = GetSystemMetrics( SM_CXSCREEN );
- pRect->bottom = GetSystemMetrics( SM_CYSCREEN );
}
- else
- SystemParametersInfo( SPI_GETWORKAREA, 0, pRect, 0 );
}
}
commit fb528c9683e7b4aca21cb999f8e7879bd1ce9f64
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat Jun 18 16:05:23 2011 +0300
Produce the expected import library name in the MinGW case
diff --git a/ucbhelper/util/makefile.mk b/ucbhelper/util/makefile.mk
index 41cd0e5..05fee92 100644
--- a/ucbhelper/util/makefile.mk
+++ b/ucbhelper/util/makefile.mk
@@ -49,7 +49,11 @@ SHL1STDLIBS = \
$(SALLIB)
SHL1DEPN=
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB= $(TARGET)$(UCBHELPER_MAJOR)$(COMID)
+.ENDIF
SHL1USE_EXPORTS=name
SHL1LIBS= $(LIB1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
commit 00f175a82fe75b315d9c24ecdfb6eb131e46fd05
Author: David Tardon <dtardon at redhat.com>
Date: Tue May 31 17:08:42 2011 +0200
gb_Deliver_add_deliverable takes 3 params now
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 1b6496c..79b3ddd 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\
# Instead of this evil linking of an object from $(OUTDIR)
define StaticLibrary_salmain_hack
$(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain),$(OUTDIR)/lib/$(1)))
$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
$$(call gb_Deliver_deliver,$$<,$$@)
commit 7beffb425136dfca48c2d7c464325db05f33dab4
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 30 18:47:58 2011 +0200
remove all traces of offuh from makefiles
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list