[Libreoffice-commits] .: setup_native/source
setup_native/source/packinfo/packinfo_sdkoo.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a4f836dbd84cb185fff79f643d71ae25abfca216 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Nov 21 09:56:21 2011 +0100 Trying to fix packaging of SDK diff --git a/setup_native/source/packinfo/packinfo_sdkoo.txt b/setup_native/source/packinfo/packinfo_sdkoo.txt index 6c895e3..591d36a 100755 --- a/setup_native/source/packinfo/packinfo_sdkoo.txt +++ b/setup_native/source/packinfo/packinfo_sdkoo.txt @@ -37,5 +37,5 @@ solariscopyright = solariscopyrightfile vendor = The Document Foundation description = Software Development Kit for LibreOffice %PRODUCTVERSION destpath = /opt -packageversion = %ABOUTBOXPRODUCTVERSION +packageversion = %PACKAGEVERSION End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in scp2/source solenv/bin
configure.in |1 + scp2/source/base/folderitem_base.scp |2 ++ scp2/source/calc/folderitem_calc.scp |2 ++ scp2/source/draw/folderitem_draw.scp |2 ++ scp2/source/impress/folderitem_impress.scp |2 ++ scp2/source/math/folderitem_math.scp |2 ++ scp2/source/writer/folderitem_writer.scp |2 ++ solenv/bin/modules/installer/windows/property.pm |4 ++-- 8 files changed, 15 insertions(+), 2 deletions(-) New commits: commit 37676d162c29331c9f6235cf51406db8aaf8dfba Author: Andras Timar ati...@suse.com Date: Mon Nov 21 10:05:00 2011 +0100 only one launcher icon for silent MSI diff --git a/configure.in b/configure.in index 49d3b8e..eebcc78 100644 --- a/configure.in +++ b/configure.in @@ -8468,6 +8468,7 @@ if test z$enable_silent_msi = z -o z$enable_silent_msi = zno ; then else AC_MSG_RESULT([yes]) ENABLE_SILENT_MSI=TRUE +SCPDEFS=$SCPDEFS -DENABLE_SILENT_MSI fi AC_SUBST(ENABLE_SILENT_MSI) diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 671bd93..c21c2a8 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; ModuleID = gid_Module_Prg_Base_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sbase Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End +#endif diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 782d135..f77258a 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; ModuleID = gid_Module_Prg_Calc_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Scalc Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End +#endif diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index a07f710..1fe1de2 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; ModuleID = gid_Module_Prg_Draw_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sdraw Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End +#endif diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index 98954f1..31c56ad 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; ModuleID = gid_Module_Prg_Impress_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Simpress Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End +#endif diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 609de29..3ad3b07 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = %PRODUCTNAME Math; ModuleID = gid_Module_Prg_Math_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Smath Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH); End +#endif diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp index 1fe448d..946ae65 100644 --- a/scp2/source/writer/folderitem_writer.scp +++ b/scp2/source/writer/folderitem_writer.scp @@ -27,6 +27,7 @@ #include macros.inc +#ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Swriter Name = %PRODUCTNAME Writer; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Swriter Styles = (NOWEB, NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER); End +#endif commit 5fc21e87b9bcc55a542c4e675f4b78cc578026d1 Author: Andras Timar ati...@suse.com Date: Mon Nov 21 09:58:55 2011 +0100 in perl there are no barewords for true/false diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index ee33596..1e6e921 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -480,7 +480,7 @@ sub update_property_table my $propertyfile = installer::files::read_file($properyfilename); -my $hasarpnomodify = false; +my $hasarpnomodify = 0; # Getting the new values # Some values (arpcomments, arpcontacts, ...) are inserted from the
[Libreoffice-commits] .: 2 commits - editeng/inc editeng/source svx/inc svx/source tools/inc unusedcode.easy vcl/inc vcl/source
editeng/inc/editeng/outliner.hxx|1 -
editeng/source/editeng/editobj.cxx |1 -
editeng/source/outliner/outlin2.cxx |7 ---
svx/inc/svx/svdlayer.hxx|1 -
svx/inc/svx/svdmrkv.hxx | 14 --
svx/inc/svx/svdobj.hxx |1 -
svx/inc/svx/svdpage.hxx |2 --
svx/inc/svx/svdpagv.hxx |7 ---
svx/source/svdraw/svdlayer.cxx | 11 ---
svx/source/svdraw/svdmrkv1.cxx | 24
svx/source/svdraw/svdobj.cxx| 11 ---
svx/source/svdraw/svdpage.cxx | 11 ---
svx/source/svdraw/svdpagv.cxx | 28
svx/source/svdraw/svdview.cxx |2 +-
tools/inc/tools/stream.hxx |6 --
unusedcode.easy |5 -
vcl/inc/impgraph.hxx|4
vcl/source/gdi/impgraph.cxx | 11 ---
18 files changed, 5 insertions(+), 142 deletions(-)
New commits:
commit 4d1c57a00ed20f49685504ac5289bc2c325060fc
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 09:00:05 2011 +
callcatcher: update list
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 89ee624..d2759a4 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -967,7 +967,6 @@ public:
voidSetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16
nY = 100 );
voidGetGlobalCharStretching( sal_uInt16 rX, sal_uInt16 rY );
-voidDoStretchChars( sal_uInt16 nX, sal_uInt16 nY );
voidEraseVirtualDevice();
sal_BoolShouldCreateBigTextObject() const;
diff --git a/editeng/source/outliner/outlin2.cxx
b/editeng/source/outliner/outlin2.cxx
index 2898eec..f91a035 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -608,13 +608,6 @@ void Outliner::GetGlobalCharStretching( sal_uInt16 rX,
sal_uInt16 rY )
pEditEngine-GetGlobalCharStretching( rX, rY );
}
-
-void Outliner::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY )
-{
-DBG_CHKTHIS(Outliner,0);
-pEditEngine-DoStretchChars( nX, nY );
-}
-
void Outliner::EraseVirtualDevice()
{
DBG_CHKTHIS(Outliner,0);
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 0fb10c6..a98154f 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -113,7 +113,6 @@ public:
// Neuer Layer wird angelegt und eingefuegt
SdrLayer* NewLayer(const String rName, sal_uInt16 nPos=0x);
void DeleteLayer(SdrLayer* pLayer)
{ aLayer.Remove(pLayer); delete pLayer; Broadcast(); }
-SdrLayer* MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos);
// Neuer Layer, Name wird aus der Resource geholt
SdrLayer* NewStandardLayer(sal_uInt16 nPos=0x);
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index d292e3c..b5442a3 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -359,13 +359,6 @@ public:
sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); }
sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); }
-// Sucht sich den ersten markierten Punkt (P1) und sucht von dort
-// aus in den ersten nichtmarkierte Punkt (P2).
-// Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
-// returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
-// andere Richtung.
-sal_Bool MarkNextPoint(sal_Bool bPrev=sal_False);
-
// Sucht sich den ersten markierten Punkt (P1) das von rPnt
// getroffen wird und sucht von dort aus den
// ersten nichtmarkierten Punkt (P2). Bei Erfolg wird die Markierung von
@@ -428,13 +421,6 @@ public:
sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); }
sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); }
-// Sucht sich den ersten markierten Klebepunkt (P1) und sucht von dort
-// aus in den ersten nichtmarkierte Klebepunkt (P2).
-// Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
-// returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
-// andere Richtung.
-sal_Bool MarkNextGluePoint(sal_Bool bPrev=sal_False);
-
// Sucht sich den ersten markierten Klebepunkt (P1) das von rPnt
// getroffen wird und sucht von dort aus den
// ersten nichtmarkierten Klebepunkt (P2). Bei Erfolg wird die Markierung
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 57c8569..eeef220 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -1167,7 +1167,6 @@ public:
private:
SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent,
SdrPage* pNewPage, SdrModel* pNewModel);
-SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent,
[Libreoffice-commits] .: 3 commits - vcl/win
vcl/win/source/gdi/salgdi3.cxx | 21 ++---
vcl/win/source/gdi/salprn.cxx |2 +-
vcl/win/source/window/salframe.cxx |4 ++--
3 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit d1916dfdb3d9b264c97415c03e7c4eb358dd9cd5
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 21 10:16:18 2011 +0100
the string is sal_Unicode, not sal_Char
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index b648c75..fd0ff89 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2646,7 +2646,7 @@ rtl::OUString WinSalFrame::GetKeyName( sal_uInt16
nKeyCode )
if( !nKeyBufLen )
return rtl::OUString();
-return rtl::OUString::createFromAscii( aKeyBuf, sal::static_int_cast
sal_uInt16 (nKeyBufLen) );
+return rtl::OUString( aKeyBuf, sal::static_int_cast sal_uInt16
(nKeyBufLen) );
}
// ---
commit 81b71b2ca666871780965aeac3eaa166a69d9b72
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 21 10:10:45 2011 +0100
init members in correct order
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 3512c58..d47f5c9 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -1195,26 +1195,25 @@ const void * GrFontData::getTable(unsigned int name,
size_t *len) const
ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes rDFS,
int nHeight, BYTE eWinCharSet, BYTE nPitchAndFamily )
: ImplFontData( rDFS, 0 ),
-meWinCharSet( eWinCharSet ),
-mnPitchAndFamily( nPitchAndFamily ),
-mpFontCharSets( NULL ),
-mpUnicodeMap( NULL ),
-mbGsubRead( false ),
+mnId( 0 ),
mbDisableGlyphApi( false ),
mbHasKoreanRange( false ),
mbHasCJKSupport( false ),
#ifdef ENABLE_GRAPHITE
+mpGraphiteData(NULL),
mbHasGraphiteSupport( false ),
#endif
mbHasArabicSupport ( false ),
mbFontCapabilitiesRead( false ),
+mpUnicodeMap( NULL ),
+mpEncodingVector( NULL ),
+mpFontCharSets( NULL ),
+mnFontCharSetCount( 0 ),
+meWinCharSet( eWinCharSet ),
+mnPitchAndFamily( nPitchAndFamily ),
mbAliasSymbolsLow( false ),
mbAliasSymbolsHigh( false ),
-mnId( 0 ),
-mpEncodingVector( NULL )
-#ifdef ENABLE_GRAPHITE
-,mpGraphiteData(NULL)
-#endif
+mbGsubRead( false )
{
SetBitmapSize( 0, nHeight );
commit 69dd81e2f26baf1e8362bee464a98b93c135e74e
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 21 10:06:27 2011 +0100
use correct rtl::OUString function
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c587235..3512c58 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2354,7 +2354,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList*
pFontList,
aDFA.mbDevice = true;
// Search Font Name in Cache
-if( !rFontName.Len() mpFontAttrCache )
+if( rFontName.isEmpty() mpFontAttrCache )
aDFA = mpFontAttrCache-GetFontAttr( rFontFileURL );
// Retrieve font name from font resource
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 6a4c0e0..b8f79d8 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -1619,7 +1619,7 @@ sal_Bool WinSalPrinter::StartJob( const rtl::OUString*
pFileName,
// bring up a file choser if printing to file port but no file name given
OUString aOutFileName;
-if( mpInfoPrinter-maPortName.EqualsIgnoreCaseAscii( FILE: )
!(pFileName pFileName-Len()) )
+if( mpInfoPrinter-maPortName.EqualsIgnoreCaseAscii( FILE: )
!(pFileName !pFileName-isEmpty()) )
{
uno::Reference lang::XMultiServiceFactory xFactory(
::comphelper::getProcessServiceFactory() );
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 083746b..b648c75 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1109,7 +1109,7 @@ void WinSalFrame::SetTitle( const rtl::OUString rTitle )
{
DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ),
WinSalFrame::SetTitle(): WCHAR != sal_Unicode );
-if ( !SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.GetBuffer())
) )
+if ( !SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) ) )
{
ByteString aAnsiTitle = ImplSalGetWinAnsiString( rTitle );
SetWindowTextA( mhWnd, aAnsiTitle.GetBuffer() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svx binfilter/inc
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx |2 +-
binfilter/bf_sfx2/source/view/sfx2_printer.cxx |4 ++--
binfilter/bf_svx/source/items/svx_paperinf.cxx |2 +-
binfilter/inc/bf_sfx2/printer.hxx| 10 +-
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 7ed11d215072e770cdf9b67eb576abb88d73ac5e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 10:07:32 2011 +
fix build error
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
index 7482982..1f4256a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
@@ -1692,7 +1692,7 @@ void ScStyleObj::SetOnePropertyValue( const
SfxItemPropertyMap* pMap, const uno:
Printer* pPrinter =
pDocShell-GetPrinter();
if (pPrinter)
{
-String aNameStr = aName;
+rtl::OUString aNameStr = aName;
USHORT nCount =
pPrinter-GetPaperBinCount();
for (USHORT i=0; inCount; i++)
if ( aNameStr ==
pPrinter-GetPaperBinName(i) )
diff --git a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
index f78891b..b03061f 100644
--- a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
+++ b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
@@ -52,7 +52,7 @@ namespace binfilter {
//
-/*N*/ SfxFont::SfxFont( const FontFamily eFontFamily, const String aFontName,
+/*N*/ SfxFont::SfxFont( const FontFamily eFontFamily, const rtl::OUString
aFontName,
/*N*/ const FontPitch eFontPitch, const CharSet eFontCharSet ):
/*N*/ aName( aFontName ),
/*N*/ eFamily( eFontFamily ),
@@ -130,7 +130,7 @@ namespace binfilter {
//
/*N*/ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
-/*N*/ const String rPrinterName ) :
+/*N*/ const rtl::OUString rPrinterName ) :
/*N*/
/*N*/ Printer ( rPrinterName ),
/*N*/ pOptions( pTheOptions ),
diff --git a/binfilter/bf_svx/source/items/svx_paperinf.cxx
b/binfilter/bf_svx/source/items/svx_paperinf.cxx
index ec82c60..4c9e631 100644
--- a/binfilter/bf_svx/source/items/svx_paperinf.cxx
+++ b/binfilter/bf_svx/source/items/svx_paperinf.cxx
@@ -115,7 +115,7 @@ static const int nTabSize = SAL_N_ELEMENTS(aDinTab);
/*?*/ inline BOOL IsValidPrinter( const Printer* pPtr )
/*?*/ {
-/*?*/ return pPtr-GetName().Len() ? TRUE : FALSE;
+/*?*/ return pPtr-GetName().getLength() ? TRUE : FALSE;
/*?*/ }
/*
diff --git a/binfilter/inc/bf_sfx2/printer.hxx
b/binfilter/inc/bf_sfx2/printer.hxx
index 519f1d4..9862249 100644
--- a/binfilter/inc/bf_sfx2/printer.hxx
+++ b/binfilter/inc/bf_sfx2/printer.hxx
@@ -59,7 +59,7 @@ struct SfxPrinter_Impl;
class SfxFont
{
private:
-String aName;
+rtl::OUString aName;
FontFamily eFamily;
FontPitch ePitch;
CharSet eCharSet;
@@ -68,11 +68,11 @@ private:
public:
SfxFont( const FontFamily eFam,
- const String aName,
+ const rtl::OUString aName,
const FontPitch eFontPitch = PITCH_DONTKNOW,
const CharSet eFontCharSet = RTL_TEXTENCODING_DONTKNOW );
// ZugriffsMethoden:
-inline const StringGetName() const { return aName; }
+inline const rtl::OUString GetName() const { return aName; }
inline FontFamily GetFamily() const { return eFamily; }
inline FontPitchGetPitch() const { return ePitch; }
inline CharSet GetCharSet() const { return eCharSet; }
@@ -92,11 +92,11 @@ private:
public:
SfxPrinter( SfxItemSet *pTheOptions );
SfxPrinter( SfxItemSet *pTheOptions,
-const String rPrinterName );
+const rtl::OUString rPrinterName );
SfxPrinter( SfxItemSet *pTheOptions,
const JobSetup rTheOrigJobSetup );
SfxPrinter( SfxItemSet *pTheOptions,
-const String rPrinterName,
+const rtl::OUString rPrinterName,
const JobSetup rTheOrigJobSetup );
~SfxPrinter();
___
[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
svx/inc/svx/svdpntv.hxx |8 --
svx/source/svdraw/svdpntv.cxx | 126 +-
unusedcode.easy |1
3 files changed, 5 insertions(+), 130 deletions(-)
New commits:
commit 18c1d56353838a393de5d75da65cc68e17d78492
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 10:10:54 2011 +
a ImplEncirclementOverlay is never constructed
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index c099d83..927f96c 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -133,9 +133,6 @@ class SVX_DLLPUBLIC SdrPaintView : public SfxListener,
public SfxRepeatTarget, p
friend classSdrGrafObj;
protected:
-// #114409#-2 Migrate Encirclement
-class ImplEncirclementOverlay* mpEncirclementOverlay;
-
SdrModel* pMod;
#ifdef DBG_UTIL
SdrItemBrowser* pItemBrowser;
@@ -293,8 +290,6 @@ public:
TYPEINFO();
virtual void ClearPageView();
-// virtual void ClearAll();
-// virtual void Clear(); // PageViews loeschen, Markierungen weg, ...
SdrModel* GetModel() const { return pMod; }
virtual sal_Bool IsAction() const;
@@ -487,9 +482,6 @@ public:
// werden soll. Wird NULL uebergeben, wird es in allen an der View
// angemeldeten OutputDevices gleichzeitig dargestellt.
void MovEncirclement(const Point rPnt);
-Rectangle EndEncirclement(sal_Bool bNoJustify = sal_False);
-void BrkEncirclement();
-sal_Bool IsEncirclement() const { return (0L != mpEncirclementOverlay); }
// use this mode as mode to draw all internal GraphicManager objects with
sal_uIntPtr GetGraphicManagerDrawMode() const { return
nGraphicManagerDrawMode; }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index dd6f700..4e66939 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -84,63 +84,6 @@ using namespace ::rtl;
using namespace ::com::sun::star;
-class ImplEncirclementOverlay
-{
-// The OverlayObjects
-::sdr::overlay::OverlayObjectList maObjects;
-
-// The remembered second position in logical coodinates
-basegfx::B2DPoint maSecondPosition;
-
-public:
-ImplEncirclementOverlay(const SdrPaintView rView, const
basegfx::B2DPoint rStartPos);
-~ImplEncirclementOverlay();
-
-void SetSecondPosition(const basegfx::B2DPoint rNewPosition);
-};
-
-ImplEncirclementOverlay::ImplEncirclementOverlay(const SdrPaintView rView,
const basegfx::B2DPoint rStartPos)
-: maSecondPosition(rStartPos)
-{
-for(sal_uInt32 a(0L); a rView.PaintWindowCount(); a++)
-{
-SdrPaintWindow* pCandidate = rView.GetPaintWindow(a);
-::sdr::overlay::OverlayManager* pTargetOverlay =
pCandidate-GetOverlayManager();
-
-if(pTargetOverlay)
-{
-::sdr::overlay::OverlayRollingRectangleStriped* aNew = new
::sdr::overlay::OverlayRollingRectangleStriped(
-rStartPos, rStartPos, false);
-pTargetOverlay-add(*aNew);
-maObjects.append(*aNew);
-}
-}
-}
-
-ImplEncirclementOverlay::~ImplEncirclementOverlay()
-{
-// The OverlayObjects are cleared using the destructor of
OverlayObjectList.
-// That destructor calls clear() at the list which removes all objects
from the
-// OverlayManager and deletes them.
-}
-
-void ImplEncirclementOverlay::SetSecondPosition(const basegfx::B2DPoint
rNewPosition)
-{
-if(rNewPosition != maSecondPosition)
-{
-// apply to OverlayObjects
-for(sal_uInt32 a(0L); a maObjects.count(); a++)
-{
-::sdr::overlay::OverlayRollingRectangleStriped rCandidate =
(::sdr::overlay::OverlayRollingRectangleStriped)maObjects.getOverlayObject(a);
-rCandidate.setSecondPosition(rNewPosition);
-}
-
-// remember new position
-maSecondPosition = rNewPosition;
-}
-}
-
-
// interface to SdrPaintWindow
SdrPaintWindow* SdrPaintView::FindPaintWindow(const OutputDevice rOut) const
@@ -260,12 +203,10 @@ void SdrPaintView::ImpClearVars()
aNam.ToUpperAscii();
maGridColor = Color( COL_BLACK );
-BrkEncirclement();
}
SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
-: mpEncirclementOverlay(0L),
-mpPageView(0L),
+: mpPageView(0L),
aDefaultAttr(pModel1-GetItemPool()),
mbBufferedOutputAllowed(false),
mbBufferedOverlayAllowed(false),
@@ -313,8 +254,6 @@ SdrPaintView::~SdrPaintView()
delete maPaintWindows.back();
maPaintWindows.pop_back();
}
-
-BrkEncirclement();
}
@@
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source
basic/source/classes/sb.cxx | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 738622d199a64327048d6a40953499b9dca5c008
Author: Michael Meeks michael.me...@novell.com
Date: Mon Jul 25 18:08:29 2011 +0100
fdo#39520 - turn DocBasicItems into an rtl::Static to improve shutdown on
mac
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index f9cbab6..9ef8de3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -164,33 +164,33 @@ namespace {
typedef ::rtl::Reference DocBasicItem DocBasicItemRef;
typedef boost::unordered_map const StarBASIC *, DocBasicItemRef
DocBasicItemMap;
-//::rtl::OUStringHash, ::std::equal_to ::rtl::OUString
ModuleInitDependencyMap;
-static DocBasicItemMap GaDocBasicItems;
+class GaDocBasicItems : public rtl::StaticDocBasicItemMap,GaDocBasicItems {};
const DocBasicItem* lclFindDocBasicItem( const StarBASIC* pDocBasic )
{
-DocBasicItemMap::iterator it = GaDocBasicItems.find( pDocBasic );
-return (it != GaDocBasicItems.end()) ? it-second.get() : 0;
+DocBasicItemMap::iterator it = GaDocBasicItems::get().find( pDocBasic );
+DocBasicItemMap::iterator end = GaDocBasicItems::get().end();
+return (it != end) ? it-second.get() : 0;
}
void lclInsertDocBasicItem( StarBASIC rDocBasic )
{
-DocBasicItemRef rxDocBasicItem = GaDocBasicItems[ rDocBasic ];
+DocBasicItemRef rxDocBasicItem = GaDocBasicItems::get()[ rDocBasic ];
rxDocBasicItem.set( new DocBasicItem( rDocBasic ) );
rxDocBasicItem-startListening();
}
void lclRemoveDocBasicItem( StarBASIC rDocBasic )
{
-DocBasicItemMap::iterator it = GaDocBasicItems.find( rDocBasic );
-if( it != GaDocBasicItems.end() )
+DocBasicItemMap::iterator it = GaDocBasicItems::get().find( rDocBasic );
+if( it != GaDocBasicItems::get().end() )
{
it-second-stopListening();
-GaDocBasicItems.erase( it );
+GaDocBasicItems::get().erase( it );
}
-DocBasicItemMap::iterator it_end = GaDocBasicItems.end();
-for( it = GaDocBasicItems.begin(); it != it_end; ++it )
+DocBasicItemMap::iterator it_end = GaDocBasicItems::get().end();
+for( it = GaDocBasicItems::get().begin(); it != it_end; ++it )
it-second-clearDependingVarsOnDelete( rDocBasic );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/workben
sal/workben/measure_oustrings.cxx |2 +-
sal/workben/testproc.cxx | 12 +---
2 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 2c46cde2edf25e8c9ae6f591b52a6b7c086fe166
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 10:40:42 2011 +
poke __cplusplus into workben comparison tool
diff --git a/sal/workben/measure_oustrings.cxx
b/sal/workben/measure_oustrings.cxx
index f9ce02b..eff82c8 100644
--- a/sal/workben/measure_oustrings.cxx
+++ b/sal/workben/measure_oustrings.cxx
@@ -45,7 +45,7 @@ int COUNT = 1;
int COUNT = 1000;
#endif
-#if defined __GXX_EXPERIMENTAL_CXX0X__
+#if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus = 201103L
# define HAVE_CXX_Ox 1
#endif
diff --git a/sal/workben/testproc.cxx b/sal/workben/testproc.cxx
index ed515ef..c015d08 100644
--- a/sal/workben/testproc.cxx
+++ b/sal/workben/testproc.cxx
@@ -43,7 +43,6 @@
int MAIN (void)
{
//oslProcess Process;
-oslProcessError ProcessError;
sal_uInt32 nArgCount;
sal_uInt32 index;
rtl_uString* ustrExeFile=0;
@@ -62,17 +61,8 @@ int MAIN (void)
fprintf(stderr,done ...\n\n);
}
-ProcessError = osl_getExecutableFile(ustrExeFile);
+osl_getExecutableFile(ustrExeFile);
-/*
-osl_executeProcess( e:\\test\\os2de202.exe,
-NULL,
-osl_Process_NORMAL,
-0L,
-NULL,
-NULL,
-NULL,
-Process );*/
return 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/signal.c |4 1 file changed, 4 insertions(+) New commits: commit 6dc6820038cf0a2d067e5fe9c72b42a79404a3c9 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Nov 18 13:07:59 2011 +0100 Do not catch signals in dbgutil build Helps debug crashes, segfaults, etc as one gets the right backtrace in gdb and dumped core. diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index abb4eaa..6a6dd1d 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -248,6 +248,10 @@ static sal_Bool InitSignal() bSetILLHandler = sal_True; } +#ifdef DBG_UTIL +bSetSEGVHandler = bSetWINCHHandler = bSetILLHandler = bDoHardKill = sal_False; +#endif + SignalListMutex = osl_createMutex(); act.sa_handler = SignalHandlerFunction; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinfo.cxx |4 ++--
vcl/win/source/gdi/salprn.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e1de8237d5f8d5ac1db3c6eb4567eaffe2e7bd86
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 11:01:56 2011 +
these need to be getStr post OUString-ization
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 9ac68b0..2db9090 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -246,8 +246,8 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString
rTitle, const rtl::O
ImplHideSplash();
return MessageBoxW(
0,
-reinterpret_castLPCWSTR(rMessage.GetBuffer()),
-reinterpret_castLPCWSTR(rTitle.GetBuffer()),
+reinterpret_castLPCWSTR(rMessage.getStr()),
+reinterpret_castLPCWSTR(rTitle.getStr()),
nFlags);
}
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index b8f79d8..0da87bd 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -210,7 +210,7 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList*
pList )
void WinSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
{
HANDLE hPrinter = 0;
-LPWSTR pPrnName =
reinterpret_castLPWSTR(const_castsal_Unicode*(pInfo-maPrinterName.GetBuffer()));
+LPWSTR pPrnName =
reinterpret_castLPWSTR(const_castsal_Unicode*(pInfo-maPrinterName.getStr()));
if( OpenPrinterW( pPrnName, hPrinter, NULL ) )
{
DWORD nBytes = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: swext/mediawiki
swext/mediawiki/help/wiki.xhp | 40 ++-- 1 file changed, 2 insertions(+), 38 deletions(-) New commits: commit e9def2a8a984098a19183d9a18fdd02778bbfdb2 Author: Andras Timar ati...@suse.com Date: Mon Nov 21 12:17:16 2011 +0100 remove system requirements/install/uninstall sections (bundled extension) diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp index 8d49b13..c75420c 100644 --- a/swext/mediawiki/help/wiki.xhp +++ b/swext/mediawiki/help/wiki.xhp @@ -50,50 +50,14 @@ paragraph role=heading id=hd_id4554582 xml-lang=en-US level=2 l10n=NEWSystem Requirements/paragraph list type=unordered listitem -paragraph role=paragraph id=par_id2597430 xml-lang=en-US l10n=NEWStarOffice/StarSuite 9/paragraph -/listitem -listitem -paragraph role=paragraph id=par_id8430738 xml-lang=en-US l10n=NEWOpenOffice.org 3.0/paragraph -/listitem -listitem -paragraph role=paragraph id=par_id9340495 xml-lang=en-US l10n=NEWJava Runtime Environment 1.4/paragraph +paragraph role=paragraph id=par_id9340495 xml-lang=en-US l10n=NEWJava Runtime Environment/paragraph /listitem listitem paragraph role=paragraph id=par_id7387615 xml-lang=en-US l10n=NEWA Wiki account on a supported link href=http://www.mediawiki.org/wiki/MediaWiki;MediaWiki/link server/paragraph /listitem /list paragraph role=heading id=hd_id8047120 xml-lang=en-US level=2 l10n=NEWInstalling Wiki Publisher/paragraph -paragraph role=paragraph id=par_id4277169 xml-lang=en-US l10n=NEWBefore you install the Wiki Publisher, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose item type=menuitemTools - Options - %PRODUCTNAME - Java/item. Ensure that Use a Java runtime environment is marked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart %PRODUCTNAME./paragraph -paragraph role=heading id=hd_id567339 xml-lang=en-US level=3 l10n=NEWTo Install the Wiki Publisher/paragraph -list type=ordered -listitem -paragraph role=paragraph id=par_id1732230 xml-lang=en-US l10n=NEWIn a Writer window, choose item type=menuitemTools - Extension Manager/item./paragraph -/listitem -listitem -paragraph role=paragraph id=par_id4338511 xml-lang=en-US l10n=NEWIn the Extension Manager dialog, click Add./paragraph -/listitem -listitem -paragraph role=paragraph id=par_id5882442 xml-lang=en-US l10n=NEWLocate the wiki-publisher.oxt file, click Open, and then click Close. /paragraph -/listitem -listitem -paragraph role=paragraph id=par_id4008911 xml-lang=en-US l10n=NEWClose %PRODUCTNAME, and close also the Quickstarter if enabled./paragraph -/listitem -listitem -paragraph role=paragraph id=par_id265511 xml-lang=en-US l10n=NEWRestart the software, open a text document, then choose item type=menuitemTools - Options - Internet - MediaWiki/item to enter your Wiki settings. See To Connect To a Wiki below./paragraph -/listitem -/list -paragraph role=heading id=hd_id3569444 xml-lang=en-US level=3 l10n=NEWTo Remove the Wiki Publisher/paragraph -list type=ordered -listitem -paragraph role=paragraph id=par_id2655110 xml-lang=en-US l10n=NEWIn a Writer window, choose item type=menuitemTools - Extension Manager/item./paragraph -/listitem -listitem -paragraph role=paragraph id=par_id9504379 xml-lang=en-US l10n=NEWClick the plus sign (+) in front of My Extensions./paragraph -/listitem -listitem -paragraph role=paragraph id=par_id8431348 xml-lang=en-US l10n=NEWSelect the extension, click Remove, and then click Close./paragraph -/listitem -/list +paragraph role=paragraph id=par_id4277169 xml-lang=en-US l10n=NEWBefore you use the Wiki Publisher, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose item type=menuitemTools - Options - %PRODUCTNAME - Java/item. Ensure that Use a Java runtime environment is marked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart %PRODUCTNAME./paragraph paragraph role=heading id=hd_id5316019 xml-lang=en-US level=2 l10n=NEWTo Connect to a Wiki/paragraph paragraph role=paragraph id=par_id2381969 xml-lang=en-US l10n=NEWNote: You can store your user name and password for all respective dialogs inside %PRODUCTNAME. The password will be stored in a secure way, where access is maintained by a master password. To enable the master password, choose item type=menuitemTools - Options - %PRODUCTNAME - Security/item./paragraph paragraph role=paragraph id=par_id3751640 xml-lang=en-US l10n=NEWNote: If you connect to the web using a proxy server, enter the proxy information to item type=menuitemTools - Options - Internet - Proxy/item, and restart the software./paragraph ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org
[Libreoffice-commits] .: svx/source
svx/source/stbctrls/pszctrl.cxx | 103 +++
svx/source/stbctrls/stbctrls.src | 14 ++---
svx/source/stbctrls/zoomctrl.cxx | 16 --
3 files changed, 59 insertions(+), 74 deletions(-)
New commits:
commit 63b3301d78f10672d1ce11e144015d60707bfb87
Author: Cor Nouws oo...@nouenoff.nl
Date: Sat Nov 19 22:37:30 2011 +0100
Translation of German comments
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 8be9399..3b83715 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -62,21 +62,21 @@
// ---
-/* [Beschreibung]
+/* [Description]
-Funktion, mit der ein metrischer Wert in textueller Darstellung
-umgewandelt wird.
+Function used to create a text representation of
+a metric value
-nVal ist hier der metrische Wert in der Einheit eUnit.
+nVal is the metric value in the unit eUnit.
-[Querverweise]
+[cross reference]
SvxPosSizeStatusBarControl::Paint(const UserDrawEvent)
*/
String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
{
-// Applikations-Metrik besorgen und setzen
+// deliver and set the Metric of the application
FieldUnit eOutUnit = SfxModule::GetModuleFieldUnit( getFrameInterface() );
FieldUnit eInUnit = FUNIT_100TH_MM;
@@ -143,36 +143,36 @@ void FunctionPopup_Impl::Select()
struct SvxPosSizeStatusBarControl_Impl
-/* [Beschreibung]
+/* [Description]
-Diese Implementations-Struktur der Klasse SvxPosSizeStatusBarControl
-dient der Entkopplung von Anderungen vom exportierten Interface sowie
-der Verringerung von extern sichtbaren Symbolen.
+This implementation-structure of the class SvxPosSizeStatusBarControl
+is done for the un-linking of the changes of the exported interface such as
+the toning down of symbols that are visible externaly.
-Eine Instanz exisitiert pro SvxPosSizeStatusBarControl-Instanz
-fur deren Laufzeit.
+One instance exists for each SvxPosSizeStatusBarControl-instance
+during it's life time
*/
{
-Point aPos; // gultig, wenn eine Position angezeigt wird
-SizeaSize; // gultig, wenn eine Gro/se angezeigt wird
-String aStr; // gultig, wenn ein Text angezeigt wird
-sal_BoolbPos; // show position
-sal_BoolbSize; // Gro/se anzeigen?
-sal_BoolbTable; // Tabellenindex anzeigen?
-sal_BoolbHasMenu; // StarCalc Popup-Menue anzeigen?
-sal_uInt16 nFunction; // selektierte StarCalc Funktion
-Image aPosImage; // Image fur die Positionsanzeige
-Image aSizeImage; // Image fur die Gro/senanzeige
+Point aPos; // valid when a position is shown
+SizeaSize; // valid when a size is shown
+String aStr; // valid when a text is shown
+sal_BoolbPos; // show position ?
+sal_BoolbSize; // set size ?
+sal_BoolbTable; // set table index ?
+sal_BoolbHasMenu; // set StarCalc popup menu ?
+sal_uInt16 nFunction; // the selected StarCalc function
+Image aPosImage; // Image to show the position
+Image aSizeImage; // Image to show the size
};
// class SvxPosSizeStatusBarControl --
-/* [Beschreibung]
+/* [Description]
Ctor():
-Anlegen einer Impl-Klassen-Instanz, Default die Zeitanzeige enablen,
-Images fur die Position und Grosse laden.
+Create an intance of the implementation class, enable the page numbering
by default
+load the images for the position and size
*/
#define STR_POSITION .uno:Position
@@ -200,10 +200,11 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl(
sal_uInt16 _nSlotId,
// ---
-/* [Beschreibung]
+/* [Description]
Dtor():
-Pointer auf die Impl-Klasse loschen, damit der Timer gestoppt wird.
+remove the pointer to the implementation class, so that the timer is
stopped
+
*/
SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
@@ -213,28 +214,28 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
// ---
-/* [Beschreibung]
+/* [Description]
-SID_PSZ_FUNCTION aktiviert das Popup-Menue fuer Calc, ansonsten:
+SID_PSZ_FUNCTION activates the popup menu for Calc:
-Statusbenachrichtigung;
-Je nach Item-Typ wird eine bestimmte Anzeige enabled, die anderen disabled.
+Status overview
+Depending on the type of the item, a special setting is enabled, the
others disabled.
NULL/Void SfxPointItemSvxSizeItem SfxStringItem
-Zeitsal_Truesal_False sal_False FALSE
+
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sw
binfilter/bf_sc/source/core/data/sc_document.cxx |2
binfilter/bf_sw/source/core/inc/drawfont.hxx | 50 ++
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 12 ++---
3 files changed, 58 insertions(+), 6 deletions(-)
New commits:
commit 37dd9a00cfb13825b9f3dfd6683db66b8aa84d09
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 21 12:58:27 2011 +0100
Fix --enable-debug --disable-dbgutil.
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 649a5f7..b1f7521 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -844,6 +844,8 @@ namespace binfilter {
/*N*/ BOOL /*bKeepScenarioFlags*/, BOOL
/*bIncludeObjects*/)
/*N*/ {
/*N*/ DBG_ASSERT( bAllTabs || pMarks, CopyToClip: ScMarkData fehlt );
+(void) bAllTabs; // avoid warnings
+(void) pMarks; // avoid warnings
/*N*/
/*N*/ if (!bIsClip)
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/inc/drawfont.hxx
b/binfilter/bf_sw/source/core/inc/drawfont.hxx
index f7db89e..cf9260e 100644
--- a/binfilter/bf_sw/source/core/inc/drawfont.hxx
+++ b/binfilter/bf_sw/source/core/inc/drawfont.hxx
@@ -337,13 +337,17 @@ public:
OutputDevice GetOut() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bOut, DrawTextInfo: Undefined Outputdevice );
+#endif
return *pOut;
}
OutputDevice *GetpOut() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bOut, DrawTextInfo: Undefined Outputdevice );
+#endif
return pOut;
}
@@ -354,98 +358,130 @@ public:
const Point GetPos() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bPos, DrawTextInfo: Undefined Position );
+#endif
return *pPos;
}
xub_StrLen *GetHyphPos() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bHyph, DrawTextInfo: Undefined Hyph Position );
+#endif
return pHyphPos;
}
const XubString GetText() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bText, DrawTextInfo: Undefined String );
+#endif
return *pText;
}
const SwWrongList* GetWrong() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bWrong, DrawTextInfo: Undefined WrongList );
+#endif
return pWrong;
}
const Size GetSize() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSize, DrawTextInfo: Undefined Size );
+#endif
return *pSize;
}
SwFont* GetFont() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bFnt, DrawTextInfo: Undefined Font );
+#endif
return pFnt;
}
SwUnderlineFont* GetUnderFnt() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSpec, DrawTextInfo: Undefined Underlinefont );
+#endif
return pUnderFnt;
}
xub_StrLen GetIdx() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bIdx, DrawTextInfo: Undefined Index );
+#endif
return nIdx;
}
xub_StrLen GetLen() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bLen, DrawTextInfo: Undefined Length );
+#endif
return nLen;
}
xub_StrLen GetOfst() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bOfst, DrawTextInfo: Undefined Offset );
+#endif
return nOfst;
}
xub_StrLen GetEnd() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bIdx, DrawTextInfo: Undefined Index );
OSL_ENSURE( bLen, DrawTextInfo: Undefined Length );
+#endif
return nIdx + nLen;
}
long GetLeft() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bLeft, DrawTextInfo: Undefined left range );
+#endif
return nLeft;
}
long GetRight() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bRight, DrawTextInfo: Undefined right range );
+#endif
return nRight;
}
long GetKanaDiff() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bKana, DrawTextInfo: Undefined kana difference );
+#endif
return nKanaDiff;
}
USHORT GetWidth() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bWidth, DrawTextInfo: Undefined Width );
+#endif
return nWidth;
}
USHORT GetAscent() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bAscent, DrawTextInfo: Undefined Ascent );
+#endif
return nAscent;
}
@@ -456,19 +492,25 @@ public:
short GetSperren() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSperr, DrawTextInfo: Undefined Sperren );
+#endif
return nSperren;
}
short GetKern() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bKern, DrawTextInfo: Undefined Kerning );
+#endif
return nKern;
}
short GetSpace() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSpace, DrawTextInfo: Undefined Spacing );
+#endif
return nSpace;
}
@@ -479,25 +521,33 @@ public:
[Libreoffice-commits] .: configmgr/qa sfx2/inc
configmgr/qa/unit/data.xcd |5 - sfx2/inc/sfx2/sfxcommands.h |1 - 2 files changed, 6 deletions(-) New commits: commit bab4bc9ec4ba1a7f85a406f413155e18caa78ee0 Author: Andras Timar ati...@suse.com Date: Mon Nov 21 13:13:22 2011 +0100 cleanup .uno:HelpSupport diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index cd1cdd3..f4d5461 100755 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -4148,11 +4148,6 @@ value xml:lang=x-no-translate/valuevalue xml:lang=en-USOptio~n Bar/value /prop /node - node oor:name=.uno:HelpSupport oor:op=replace -prop oor:name=Label oor:type=xs:string - value xml:lang=x-no-translate/valuevalue xml:lang=en-US~Support/value -/prop - /node node oor:name=.uno:StatusBarVisible oor:op=replace prop oor:name=Label oor:type=xs:string value xml:lang=x-no-translate/valuevalue xml:lang=en-USStatus ~Bar/value diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h index 3e77b53..ee56e78 100644 --- a/sfx2/inc/sfx2/sfxcommands.h +++ b/sfx2/inc/sfx2/sfxcommands.h @@ -303,7 +303,6 @@ #define CMD_SID_ADDONS .uno:Addons #define CMD_SID_SHOW_IME_STATUS_WINDOW .uno:ShowImeStatusWindow #define CMD_SID_UPDATE_CONFIG .uno:UpdateConfiguration -#define CMD_SID_HELP_SUPPORTPAGE.uno:HelpSupport #define CMD_SID_HELP_TUTORIALS .uno:HelpTutorials #define CMD_SID_ADDONHELP .uno:AddonHelp #define CMD_SID_FORMATMENUSTATE .uno:FormatMenuState ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - vcl/inc vcl/win
vcl/inc/win/salprn.h |6 +++---
vcl/win/source/gdi/salgdi3.cxx |4 ++--
vcl/win/source/gdi/salprn.cxx| 30 +++---
vcl/win/source/gdi/winlayout.cxx | 13 +++--
4 files changed, 27 insertions(+), 26 deletions(-)
New commits:
commit 1c2f5d73a774d93a8e3660a0cc91e32d1f86fd77
Author: David Tardon dtar...@redhat.com
Date: Mon Nov 21 13:14:36 2011 +0100
more conversion to rtl::OUString
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index e4d67b8..3b64c62 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -59,9 +59,9 @@ class WinSalInfoPrinter : public SalInfoPrinter
{
public:
WinSalGraphics* mpGraphics; // current Printer graphics
-XubString maDriverName; // printer driver name
-XubString maDeviceName; // printer device name
-XubString maPortName; // printer port name
+rtl::OUString maDriverName; // printer driver name
+rtl::OUString maDeviceName; // printer device name
+rtl::OUString maPortName; // printer port name
HDC mhDC; // printer hdc
sal_BoolmbGraphics; // is Graphics used
public:
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 0da87bd..7a7c983 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -194,7 +194,7 @@ void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList*
pList )
for ( i = 0; i nInfoPrn4; i++ )
{
SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
-pInfo-maPrinterName = UniString( reinterpret_cast const
sal_Unicode* (pWinInfo4[i].pPrinterName) );
+pInfo-maPrinterName = rtl::OUString( reinterpret_cast const
sal_Unicode* (pWinInfo4[i].pPrinterName) );
pInfo-mnStatus = 0;
pInfo-mnJobs= 0;
pInfo-mpSysData = NULL;
@@ -297,8 +297,8 @@ static DWORD ImplDeviceCaps( WinSalInfoPrinter* pPrinter,
WORD nCaps,
else
pDevMode = SAL_DEVMODE_W( pSetupData );
-return DeviceCapabilitiesW(
reinterpret_castLPCWSTR(pPrinter-maDeviceName.GetBuffer()),
-
reinterpret_castLPCWSTR(pPrinter-maPortName.GetBuffer()),
+return DeviceCapabilitiesW(
reinterpret_castLPCWSTR(pPrinter-maDeviceName.getStr()),
+
reinterpret_castLPCWSTR(pPrinter-maPortName.getStr()),
nCaps, (LPWSTR)pOutput, pDevMode );
}
@@ -330,7 +330,7 @@ static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter*
pPrinter,
// #110800#, #51#, #112381#, #i16580#, #i14173# and perhaps
#112375#
ByteString aPrinterNameA= ImplSalGetWinAnsiString(
pPrinter-maDeviceName, TRUE );
HANDLE hPrn;
-LPWSTR pPrinterNameW =
reinterpret_castLPWSTR(const_castsal_Unicode*(pPrinter-maDeviceName.GetBuffer()));
+LPWSTR pPrinterNameW =
reinterpret_castLPWSTR(const_castsal_Unicode*(pPrinter-maDeviceName.getStr()));
if ( !OpenPrinterW( pPrinterNameW, hPrn, NULL ) )
return FALSE;
@@ -396,7 +396,7 @@ static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter*
pPrinter, ImplJobSetup
{
ByteString aPrinterNameA = ImplSalGetWinAnsiString(
pPrinter-maDeviceName, TRUE );
HANDLE hPrn;
-LPWSTR pPrinterNameW =
reinterpret_castLPWSTR(const_castsal_Unicode*(pPrinter-maDeviceName.GetBuffer()));
+LPWSTR pPrinterNameW =
reinterpret_castLPWSTR(const_castsal_Unicode*(pPrinter-maDeviceName.getStr()));
if ( !OpenPrinterW( pPrinterNameW, hPrn, NULL ) )
return FALSE;
// #131642# hPrn==HGDI_ERROR even though OpenPrinter() succeeded!
@@ -1072,14 +1072,14 @@ static HDC ImplCreateSalPrnIC( WinSalInfoPrinter*
pPrinter, ImplJobSetup* pSetup
pDevMode = NULL;
// #95347 some buggy drivers (eg, OKI) write to those buffers in CreateIC,
although declared const - so provide some space
// pl: does this hold true for Unicode functions ?
-if( pPrinter-maDriverName.Len() 2048 || pPrinter-maDeviceName.Len()
2048 )
+if( pPrinter-maDriverName.getLength() 2048 ||
pPrinter-maDeviceName.getLength() 2048 )
return 0;
sal_Unicode pDriverName[ 4096 ];
sal_Unicode pDeviceName[ 4096 ];
-rtl_copyMemory( pDriverName, pPrinter-maDriverName.GetBuffer(),
pPrinter-maDriverName.Len()*sizeof(sal_Unicode));
-memset( pDriverName+pPrinter-maDriverName.Len(), 0, 32 );
-rtl_copyMemory( pDeviceName, pPrinter-maDeviceName.GetBuffer(),
pPrinter-maDeviceName.Len()*sizeof(sal_Unicode));
-memset( pDeviceName+pPrinter-maDeviceName.Len(), 0, 32 );
+rtl_copyMemory( pDriverName, pPrinter-maDriverName.getStr(),
[Libreoffice-commits] .: sd/source
sd/source/ui/presenter/SlideRenderer.cxx | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
New commits:
commit 54bc5bc910e6082398d6b2f55fa7dba65421bbb7
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Nov 17 19:03:08 2011 +0900
removed useless code
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx
b/sd/source/ui/presenter/SlideRenderer.cxx
index 148e832..ea2f14f 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -104,17 +104,7 @@ void SAL_CALL SlideRenderer::initialize (const
SequenceAny rArguments)
{
ThrowIfDisposed();
-if (rArguments.getLength() == 0)
-{
-try
-{
-}
-catch (RuntimeException)
-{
-throw;
-}
-}
-else
+if (rArguments.getLength() != 0)
{
throw RuntimeException(
OUString(RTL_CONSTASCII_USTRINGPARAM(SlideRenderer: invalid
number of arguments)),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/ucbhelper/tempfile.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c6560c6f07f7f71842d7314157feaca2fa4a03c9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 12:56:43 2011 +
Resolves fdo#41295 tmp name reuse in mass pdf export
diff --git a/unotools/source/ucbhelper/tempfile.cxx
b/unotools/source/ucbhelper/tempfile.cxx
index d157bab..6728c80 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -206,8 +206,8 @@ void CreateTempName_Impl( String rName, sal_Bool bKeep,
sal_Bool bDir = sal_Tru
aName += String::CreateFromAscii( lu );
rName.Erase();
-unsigned long nSeed = Time::GetSystemTicks() % nMax;
-for ( unsigned long u = nSeed; ++u != nSeed; )
+static unsigned long u = Time::GetSystemTicks() % nMax;
+for ( unsigned long nSeed = u; ++u != nSeed; )
{
u %= nMax;
String aTmp( aName );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dtrans/StaticLibrary_dtobj.mk
dtrans/StaticLibrary_dtobj.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 1ef42cb0c53fc8d5adf259079833ba07dd12cb66 Author: Jan Holesovsky ke...@suse.cz Date: Mon Nov 21 13:58:27 2011 +0100 Fix MinGW build of dtrans. diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk index ee125ce..f3e535d 100644 --- a/dtrans/StaticLibrary_dtobj.mk +++ b/dtrans/StaticLibrary_dtobj.mk @@ -31,6 +31,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj)) $(eval $(call gb_StaticLibrary_set_include,dtobj,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dtrans/inc/pch) \ + -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_StaticLibrary_add_api,dtobj,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce60138d339a5eb2a174a5d27063249acf2cac42
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 13:11:46 2011 +
link error
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 58ec98f..71066ac 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2169,7 +2169,7 @@ static int WINAPI __AddFontResourceExW( LPCWSTR
lpszfileName, DWORD fl, PVOID pd
}
#endif
-bool ImplAddTempFont( SalData rSalData, const String rFontFileURL )
+bool ImplAddTempFont( SalData rSalData, const rtl::OUString rFontFileURL )
{
int nRet = 0;
::rtl::OUString aUSytemPath;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/Makefile |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 3739278cefa4f604d96fc8c1047de22687e064ed Author: Eike Rathke er...@redhat.com Date: Mon Nov 21 14:12:14 2011 +0100 still cygwin is not unix diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile index 5b899f0..6c3774e 100755 --- a/i18npool/source/localedata/Makefile +++ b/i18npool/source/localedata/Makefile @@ -36,13 +36,15 @@ my_components := component/sax/source/expatwrap/expwrap.component localedata_%.cxx : localedata_%_invis.cxx sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $ $@ -localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ - $(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build) ifeq ($(OS_FOR_BUILD),WNT) +localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ + $(OUTDIR)/bin/saxparser$(gb_Executable_EXT) $(gb_Helper_execute)saxparser $* `cygpath -m $` $@ \ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` \ -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin` else +localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ + $(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build) $(gb_Helper_execute)saxparser $* $ $@ \ $(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \ -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salprn.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96d01c8f07478f4241f014145a64c57b041f0d44 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Nov 21 14:14:40 2011 +0100 disambiguate (OU)?String comparison into OUString comparison diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 5f58cb7..bcfc850 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -368,7 +368,7 @@ static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, } SalDriverData* pSetupDriverData = (SalDriverData*)(pSetupData-mpDriverData); if ( (pSetupData-mnSystem == JOBSETUP_SYSTEM_WINDOWS) - (pPrinter-maDriverName == pSetupData-maDriver) + (OUString(pPrinter-maDriverName) == pSetupData-maDriver) (pSetupData-mnDriverDataLen sizeof( SalDriverData )) (long)(pSetupData-mnDriverDataLen - pSetupDriverData-mnDriverOffset) == nSysJobSize pSetupDriverData-mnSysSignature == SAL_DRIVERDATA_SYSSIGN ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - filter/source sw/source
filter/source/xslt/import/wordml/wordml2ooo_draw.xsl |1
sw/source/core/tox/tox.cxx |4 +
sw/source/core/unocore/unotext.cxx |3 -
sw/source/ui/docvw/HeaderFooterWin.cxx |6 +-
sw/source/ui/inc/olmenu.hxx |1
sw/source/ui/lingu/olmenu.cxx| 45 +++
sw/source/ui/lingu/olmenu.hrc|2
sw/source/ui/lingu/olmenu.src|5 +-
8 files changed, 62 insertions(+), 5 deletions(-)
New commits:
commit 6af8887b41a8438d29b4743f238be7330516ecbc
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Nov 21 13:49:06 2011 +0100
d#648250: added missing include in wordml2ooo_draw.xsl
diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
index 448923f..e36d7cd 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
@@ -27,6 +27,7 @@
--
xsl:stylesheet version=1.0 xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0
xmlns:w=http://schemas.microsoft.com/office/word/2003/wordml;
xmlns:wx=http://schemas.microsoft.com/office/word/2003/auxHint;
xmlns:o=urn:schemas-microsoft-com:office:office
xmlns:aml=http://schemas.microsoft.com/aml/2001/core;
xmlns:dt=uuid:C2F41010-65B3-11d1-A29F-00AA00C14882
xmlns:v=urn:schemas-microsoft-com:vml
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0
xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0
xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0
xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0
xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0
xmlns:xlink=http://www.w3.org/1999/xlink;
xmlns:dc=http://purl.org/dc/elements/1.1/;
xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0
xmlns:number=urn:oasis:names:tc:opendocument:xmlns:dat
astyle:1.0
xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0
xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0
xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0
xmlns:math=http://www.w3.org/1998/Math/MathML;
xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0
xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0
xmlns:config=urn:oasis:names:tc:opendocument:xmlns:config:1.0
xmlns:ooo=http://openoffice.org/2004/office;
xmlns:ooow=http://openoffice.org/2004/writer;
xmlns:oooc=http://openoffice.org/2004/calc;
xmlns:dom=http://www.w3.org/2001/xml-events;
xmlns:ole=http://libreoffice.org/2011/xslt/ole; exclude-result-prefixes=w wx
aml o dt v
xsl:include href=wordml2ooo_custom_draw.xsl/
+xsl:include href=wordml2ooo_path.xsl/
xsl:key name=imagedata match=w:binData use=@w:name/
xsl:key name=shapetype match=v:shapetype use=concat('#', @id)/
commit 9562b31e594eba4e6abf7879575b77a691ac1f88
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Nov 21 12:05:22 2011 +0100
sw, added a message to a thrown uno::RuntimeException
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 2886b36..c9d02d5 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2501,7 +2501,8 @@ throw (uno::RuntimeException)
}
if(!aRef.is())
{
-throw uno::RuntimeException();
+throw uno::RuntimeException( rtl::OUString::createFromAscii( End of
content node doesn't have the proper start node ),
+ uno::Reference uno::XInterface ( *this ) );
}
return aRef;
}
commit a1efc7fdcd80484977bc289d1d27b7b6d33757ff
Author: Thomas Collerton tom.col...@gmail.com
Date: Fri Nov 18 12:17:13 2011 +0100
Improved Header/Footer UI framerate
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 1db769a..076ce17 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -191,7 +191,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin,
const SwPageFrm* pPag
m_pPopupMenu-SetItemText( FN_HEADERFOOTER_DELETE, aRewriter.Apply( aText
) );
SetPopupMenu( m_pPopupMenu );
-m_aFadeTimer.SetTimeout( 500 );
+m_aFadeTimer.SetTimeout( 50 );
m_aFadeTimer.SetTimeoutHdl( LINK( this, SwHeaderFooterWin, FadeHandler ) );
}
@@ -501,9 +501,9 @@ void SwHeaderFooterWin::Select( )
IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *, EMPTYARG )
{
if ( m_bIsAppearing m_nFadeRate 0 )
-m_nFadeRate -= 10;
+m_nFadeRate -= 25;
else if ( !m_bIsAppearing m_nFadeRate 100 )
-m_nFadeRate += 10;
+m_nFadeRate += 25;
if ( m_nFadeRate != 100 !IsVisible() )
{
commit 2cc144286d81236e8677a551a458172ca9546c29
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Mon Nov
[Libreoffice-commits] .: 2 commits - icu/makefile.mk icu/prj RepositoryExternal.mk sal/osl solenv/inc
RepositoryExternal.mk| 26 -- icu/makefile.mk | 17 +++-- icu/prj/d.lst|6 ++ sal/osl/android/Makefile |6 +++--- solenv/inc/libs.mk |9 +++-- 5 files changed, 43 insertions(+), 21 deletions(-) New commits: commit 27f585b6b5391e45106e76a35990b588570d8acd Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Nov 21 15:46:42 2011 +0200 Link with -lgnustl_shared for Android diff --git a/icu/makefile.mk b/icu/makefile.mk index 79889a2..20fcb10 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -138,6 +138,7 @@ BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-bu .IF $(OS)==ANDROID LIBRARY_SUFFIX= --with-library-suffix=lo +icu_LDFLAGS+=-lgnustl_shared .ENDIF CONFIGURE_ACTION+=sh -c 'CPPFLAGS=$(EXTRA_CDEFS) CFLAGS=$(icu_CFLAGS) CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) $(LDFLAGSADD) \ commit 8a3ea757c35a000ea303a11b36692aebc2400ead Author: Tor Lillqvist tlillqv...@suse.com Date: Mon Nov 21 14:25:37 2011 +0200 Use --with-library-suffix=lo for Android to avoid clash with system ICU diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d7ff86f..11deeaa 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -384,6 +384,12 @@ endef else # !SYSTEM_ICU +ifeq ($(OS),ANDROID) +gb_ICU_suffix:=lo +else +gb_ICU_suffix:= +endif + # icudata and icui18n is called icudt and icuin when built with MSVC :-( ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ @@ -408,22 +414,22 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ endef else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - icudata \ - icui18n \ - icule \ - icutu \ - icuuc \ + icudata$(gb_ICU_suffix) \ + icui18n$(gb_ICU_suffix) \ + icule$(gb_ICU_suffix) \ + icutu$(gb_ICU_suffix) \ + icuuc$(gb_ICU_suffix) \ )) define gb_LinkTarget__use_icudata $(call gb_LinkTarget_add_linked_libs,$(1),\ - icudata \ + icudata$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icui18n $(call gb_LinkTarget_add_linked_libs,$(1),\ - icui18n \ + icui18n$(gb_ICU_suffix) \ ) endef @@ -431,19 +437,19 @@ endif define gb_LinkTarget__use_icule $(call gb_LinkTarget_add_linked_libs,$(1),\ - icule \ + icule$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icutu $(call gb_LinkTarget_add_linked_libs,$(1),\ - icutu \ + icutu$(gb_ICU_suffix) \ ) endef define gb_LinkTarget__use_icuuc $(call gb_LinkTarget_add_linked_libs,$(1),\ - icuuc \ + icuuc$(gb_ICU_suffix) \ ) endef diff --git a/icu/makefile.mk b/icu/makefile.mk index f0e9dfa..79889a2 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -136,8 +136,12 @@ STATIC_OR_SHARED=--disable-static --enable-shared BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source .ENDIF +.IF $(OS)==ANDROID +LIBRARY_SUFFIX= --with-library-suffix=lo +.ENDIF + CONFIGURE_ACTION+=sh -c 'CPPFLAGS=$(EXTRA_CDEFS) CFLAGS=$(icu_CFLAGS) CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) $(LDFLAGSADD) \ -./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) ' +./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)' CONFIGURE_FLAGS= @@ -159,11 +163,11 @@ OUT2LIB= \ $(BUILD_DIR)$/lib$/libicutu.a .ELIF $(OS)==ANDROID OUT2LIB= \ -$(BUILD_DIR)$/lib$/libicudata.so \ -$(BUILD_DIR)$/lib$/libicuuc.so \ -$(BUILD_DIR)$/lib$/libicui18n.so \ -$(BUILD_DIR)$/lib$/libicule.so \ -$(BUILD_DIR)$/lib$/libicutu.so +$(BUILD_DIR)$/lib$/libicudatalo.so \ +$(BUILD_DIR)$/lib$/libicuuclo.so \ +$(BUILD_DIR)$/lib$/libicui18nlo.so \ +$(BUILD_DIR)$/lib$/libiculelo.so \ +$(BUILD_DIR)$/lib$/libicutulo.so .ELSE OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \ diff --git a/icu/prj/d.lst b/icu/prj/d.lst index 3ae4de0..91000be 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -31,6 +31,12 @@ mkdir: %_DEST%\inc\external\unicode ..\%__SRC%\lib\libicuuc.so %_DEST%\lib\ ..\%__SRC%\lib\libicutu.so %_DEST%\lib\ +..\%__SRC%\lib\libicudatalo.so%_DEST%\lib\ +..\%__SRC%\lib\libicui18nlo.so%_DEST%\lib\ +..\%__SRC%\lib\libiculelo.so %_DEST%\lib\ +..\%__SRC%\lib\libicuuclo.so %_DEST%\lib\ +..\%__SRC%\lib\libicutulo.so %_DEST%\lib\ + ..\%__SRC%\lib\libicudata.a %_DEST%\lib\ ..\%__SRC%\lib\libicui18n.a %_DEST%\lib\ ..\%__SRC%\lib\libicule.a %_DEST%\lib\ diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile index f772b84..dd392f5 100644 --- a/sal/osl/android/Makefile +++ b/sal/osl/android/Makefile @@ -62,9 +62,9 @@ ndk-build: gcc3_uno \
[Libreoffice-commits] .: svx/source
svx/source/stbctrls/pszctrl.cxx | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 4d399eea4283173d0b8c766376ad538f1e088d92
Author: Cor Nouws oo...@nouenoff.nl
Date: Mon Nov 21 14:23:29 2011 +0100
Updated transl. German comments - removd obsolete time/date comm
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 3b83715..ebaf1c0 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -171,7 +171,7 @@ struct SvxPosSizeStatusBarControl_Impl
/* [Description]
Ctor():
-Create an intance of the implementation class, enable the page numbering
by default
+Create an instance of the implementation class,
load the images for the position and size
*/
@@ -223,18 +223,16 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
NULL/Void SfxPointItemSvxSizeItem SfxStringItem
-Timesal_Truesal_False sal_False FALSE
Positionsal_False FALSE
SizeFALSE TRUEFALSE
Textsal_False sal_False TRUE
-Another item resulst in an assert, that enables showing of the time.
*/
void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState
eState,
const SfxPoolItem* pState )
{
-// the combi-controller, always set the curent Id as HelpId
+// Because the combi-controller, always sets the curent Id as HelpId
// first clean the cached HelpText
GetStatusBar().SetHelpText( GetId(), String() );
@@ -298,7 +296,6 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
else
{
DBG_ERRORFILE( invalid item type );
-// nevertheless show date and time
pImp-bPos = sal_False;
pImp-bSize = sal_False;
pImp-bTable = sal_False;
@@ -307,8 +304,8 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16
nSID, SfxItemState eSt
if ( GetStatusBar().AreItemsVisible() )
GetStatusBar().SetItemData( GetId(), 0 );
-// set only strings as text at the statusBar, because the Help-Tips
-// functions, when the text is too long
+// set only strings as text at the statusBar, so that the Help-Tips
+// can work with the text, when it is too long for the statusBar
String aText;
if ( pImp-bTable )
aText = pImp-aStr;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svx
binfilter/bf_svx/source/items/svx_paperinf.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7085c55b78d0346197feb964d124565436121d11
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 21 16:19:05 2011 +0100
OUString has no Len(), use !isEmpty() here
diff --git a/binfilter/bf_svx/source/items/svx_paperinf.cxx
b/binfilter/bf_svx/source/items/svx_paperinf.cxx
index 4c9e631..0f32c0b 100644
--- a/binfilter/bf_svx/source/items/svx_paperinf.cxx
+++ b/binfilter/bf_svx/source/items/svx_paperinf.cxx
@@ -115,7 +115,7 @@ static const int nTabSize = SAL_N_ELEMENTS(aDinTab);
/*?*/ inline BOOL IsValidPrinter( const Printer* pPtr )
/*?*/ {
-/*?*/ return pPtr-GetName().getLength() ? TRUE : FALSE;
+/*?*/ return !pPtr-GetName().isEmpty();
/*?*/ }
/*
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - cppcanvas/source vcl/source vcl/unx
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 15 +++
vcl/source/gdi/gradient.cxx |3 +--
vcl/unx/generic/printer/printerinfomanager.cxx |8
3 files changed, 20 insertions(+), 6 deletions(-)
New commits:
commit d4d79be21e16be9e77518cd223865bb2eb4f91ed
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Nov 21 16:33:07 2011 +0100
Fix radial gradient offset
Seems this got broken with the Gradient::GetBoundRect() common code
extraction - actually return what was calculated (fixes part of
n#714787).
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 38d8ba4..ad18106 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -276,7 +276,6 @@ void Gradient::GetBoundRect( const Rectangle rRect,
Rectangle rBoundRect, Poin
}
else
{
-
if( GetStyle() == GRADIENT_SQUARE || GetStyle() == GRADIENT_RECT )
{
const doublefAngle = nAngle * F_PI1800;
@@ -332,7 +331,7 @@ void Gradient::GetBoundRect( const Rectangle rRect,
Rectangle rBoundRect, Poin
aRect.Top() = rCenter.Y() - ( aSize.Height() 1 );
aRect.SetSize( aSize );
-rBoundRect = rRect;
+rBoundRect = aRect;
}
}
commit 7ddc69623db91317edff6aaca44e5edd43804578
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Nov 21 16:34:27 2011 +0100
Make dbglevel=3 compile again in vcl
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx
b/vcl/unx/generic/printer/printerinfomanager.cxx
index 0cd00db..2de6891 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -1049,23 +1049,23 @@ void PrinterInfoManager::fillFontSubstitutions(
PrinterInfo rInfo ) const
if( nSubstitute != -1 )
{
rInfo.m_aFontSubstitutions[ it-m_nID ] = nSubstitute;
-#if OSL_DEBUG_LEVEL 2
+#if OSL_DEBUG_LEVEL 2
FastPrintFontInfo aInfo;
rFontManager.getFontFastInfo( nSubstitute, aInfo );
fprintf( stderr,
substitute %s %s %d %d\n
-%s %s %d %d\n,
rtl::OUStringToOString( it-m_aFamilyName,
RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-it-m_eItalic == italic::Upright ? r : it-m_eItalic ==
italic::Oblique ? o : it-m_eItalic == italic::Italic ? i : u,
+it-m_eItalic == ITALIC_NONE ? r : it-m_eItalic ==
ITALIC_OBLIQUE ? o : it-m_eItalic == ITALIC_NORMAL ? i : u,
it-m_eWeight,
it-m_eWidth,
rtl::OUStringToOString( aInfo.m_aFamilyName,
RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
-aInfo.m_eItalic == italic::Upright ? r : aInfo.m_eItalic
== italic::Oblique ? o : aInfo.m_eItalic == italic::Italic ? i : u,
+aInfo.m_eItalic == ITALIC_NONE ? r : aInfo.m_eItalic ==
ITALIC_OBLIQUE ? o : aInfo.m_eItalic == ITALIC_NORMAL ? i : u,
aInfo.m_eWeight,
aInfo.m_eWidth
);
-#endif
+#endif
}
}
}
commit 828abf1e060d2ba385547b09c0eff61dfa6ea377
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Nov 21 16:34:50 2011 +0100
Revive gradient clipping debug visualization code.
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 93f83e7..cc7aa1a 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -465,6 +465,21 @@ namespace cppcanvas
rendering::RenderState aLocalState( maState );
::canvas::tools::setRenderStateTransform(aLocalState,
aTransform);
+#if OSL_DEBUG_LEVEL 2
+aLocalState.Clip.clear();
+aLocalState.DeviceColor =
+::vcl::unotools::colorToDoubleSequence(
+::Color( 0x80FF ),
+
mpCanvas-getUNOCanvas()-getDevice()-getDeviceColorSpace() );
+
+if( maState.Clip.is() )
+mpCanvas-getUNOCanvas()-fillPolyPolygon( maState.Clip,
+
mpCanvas-getViewState(),
+ aLocalState );
+
+aLocalState.DeviceColor = maState.DeviceColor;
+#endif
+
if( ::rtl::math::approxEqual(mnAlpha, 1.0) )
{
// no further alpha changes necessary - draw directly
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
[Libreoffice-commits] .: tools/inc tools/source
tools/inc/tools/fsys.hxx | 28 +--
tools/source/fsys/comdep.hxx |6
tools/source/fsys/dirent.cxx | 341 -
tools/source/fsys/filecopy.cxx | 10 -
tools/source/fsys/fstat.cxx| 17 --
tools/source/fsys/tdir.cxx | 13 -
tools/source/fsys/wntmsc.cxx |8
tools/source/fsys/wntmsc.hxx |2
8 files changed, 213 insertions(+), 212 deletions(-)
New commits:
commit 2a2fbbecc04b1364216a5180f722fb72ed00d42d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 15:12:34 2011 +
ByteString-rtl::OString
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index ee64c7f..f4d01cd 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -223,13 +223,13 @@ friend class FileCopier;
#ifdef FEAT_FSYS_DOUBLESPEED
FileStat* pStat; // optional
#endif
-ByteString aName;
+rtl::OStringaName;
DirEntry* pParent;
sal_uIntPtr nError;
DirEntryFlageFlag;
private:
-TOOLS_DLLPRIVATEDirEntry( const ByteString rInitName,
+TOOLS_DLLPRIVATEDirEntry( const rtl::OString rInitName,
DirEntryFlag aDirFlag,
FSysPathStyle eStyle );
@@ -237,13 +237,13 @@ private:
friend class FileStat;
friend const char* ImpCheckDirEntry( const void* p );
-TOOLS_DLLPRIVATE FSysError ImpParseName( const ByteString
rIntiName,
+TOOLS_DLLPRIVATE FSysError ImpParseName( const rtl::OString
rIntiName,
FSysPathStyle eParser );
#if defined(WNT)
-TOOLS_DLLPRIVATE FSysError ImpParseOs2Name( const ByteString
rPfad,
+TOOLS_DLLPRIVATE FSysError ImpParseOs2Name( const rtl::OString
rPfad,
FSysPathStyle eStyle );
#else
-TOOLS_DLLPRIVATE FSysError ImpParseUnixName( const ByteString
rPfad,
+TOOLS_DLLPRIVATE FSysError ImpParseUnixName( const rtl::OString
rPfad,
FSysPathStyle eStyle );
#endif
TOOLS_DLLPRIVATE const DirEntry*ImpGetTopPtr() const;
@@ -251,7 +251,7 @@ private:
protected:
voidImpTrim( FSysPathStyle eStyle );
-const ByteString ImpTheName() const;
+const rtl::OString ImpTheName() const;
DirEntryFlagImpTheFlag() const { return eFlag; };
DirEntry* ImpChangeParent( DirEntry* pNewParent, sal_Bool
bNormalize = sal_True );
DirEntry* ImpGetParent() { return pParent; }
@@ -266,7 +266,7 @@ protected:
public:
DirEntry( DirEntryFlag aDirFlag = FSYS_FLAG_CURRENT );
DirEntry( const DirEntry rEntry );
-DirEntry( const ByteString rInitName,
+DirEntry( const rtl::OString rInitName,
FSysPathStyle eParser = FSYS_STYLE_HOST );
DirEntry( const String rInitName,
FSysPathStyle eParser = FSYS_STYLE_HOST );
@@ -323,16 +323,16 @@ public:
sal_Booloperator !=( const DirEntry rAnotherDir ) const
{ return !(DirEntry::operator==( rAnotherDir )); }
-inline StringCompare NameCompareDirect( const DirEntry rWith ) const
-{
+inline sal_Int32 NameCompareDirect( const DirEntry rWith ) const
+{
#ifdef UNX
-return rWith.aName.CompareTo( aName );
+return rWith.aName.compareTo(aName);
#else
-rtl::OString
aThis(rtl::OString(aName).toAsciiLowerCase());
-rtl::OString
aWith(rtl::OString(rWith.aName).toAsciiLowerCase());
-return
static_castStringCompare(aWith.compareTo(aThis));
+rtl::OString aThis(rtl::OString(aName).toAsciiLowerCase());
+rtl::OString aWith(rtl::OString(rWith.aName).toAsciiLowerCase());
+return aWith.compareTo(aThis);
#endif
-}
+}
static String GetAccessDelimiter( FSysPathStyle eFormatter =
FSYS_STYLE_HOST );
static String GetSearchDelimiter( FSysPathStyle eFormatter =
FSYS_STYLE_HOST );
diff --git a/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 94dfdff..1728116 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.hxx
@@ -64,7 +64,7 @@ struct DirReader_Impl
dirent* pDosEntry;
DirEntry* pParent;
String aPath;
-ByteString aBypass;
+rtl::OString aBypass;
sal_BoolbReady;
sal_BoolbInUse;
@@ -86,8 +86,8 @@ struct DirReader_Impl
#if defined(UNX)//for further eplanation see DirReader_Impl::Read() in
unx.cxx
pDosDir = NULL;
#else
-aBypass = ByteString(aPath,
[Libreoffice-commits] .: 5 commits - bridges/inc bridges/source icu/makefile.mk sal/osl
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx |3 -
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx|8 +++
icu/makefile.mk |2
sal/osl/android/Makefile | 41 ---
4 files changed, 38 insertions(+), 16 deletions(-)
New commits:
commit 7a357d93d8bc7cc47b6352546a47973379f513e4
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Nov 21 18:17:10 2011 +0200
Add stuff to run bridgetest
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile
index e7d6c67..660126c 100644
--- a/sal/osl/android/Makefile
+++ b/sal/osl/android/Makefile
@@ -1,3 +1,8 @@
+# The full path the the app's directory needs to be supplied in a
+# couple of places, unfortunately.
+
+APP_DATA_PATH=/data/data/org.libreoffice.android
+
NDK_HOME:=$(shell type -p ndk-build)
NDK_HOME:=$(shell dirname $(NDK_HOME))
@@ -80,20 +85,32 @@ ndk-build:
# Then the shared GNU C++ library
$(call
COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so)
#
+# bridgetest components, not in solver
+ for F in bridgetest constructors cppobj; do \
+ $(call
COPY,$(SRC_ROOT)/testtools/$(INPATH)/lib/lib$${F}.uno.so); \
+ done
+#
# Then other assets. Let the directory structure under assets mimic
# that under solver for now.
- mkdir -p assets/bin assets/xml/ure assets/ComponentTarget/i18npool/util
+ mkdir -p assets/bin assets/lib assets/xml/ure
assets/ComponentTarget/i18npool/util
cp $(OUTDIR)/bin/udkapi.rdb assets/bin
cp $(OUTDIR)/bin/types.rdb assets/bin
cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component
assets/ComponentTarget/i18npool/util
+ for F in uno_services uno_types; do \
+ sed -e 's!uri=./!uri=$(APP_DATA_PATH)/lib/!g'
$(SRC_ROOT)/testtools/$(INPATH)/lib/$${F}.rdb assets/lib/$${F}.rdb; \
+ done
install: ndk-build
unset JAVA_HOME ant debug install
run: install
-# Note: these are just examples. The full path the the app's directory
-# needs to be supplied in a couple of places, unfortunately.
-
-# adb shell am start -n org.libreoffice.android/.Bootstrap -e
lo-main-library libcppunittester -e lo-main-cmdline
/data/data/org.libreoffice.android/lib/libqa_sal_types.so
-# adb shell am start -n org.libreoffice.android/.Bootstrap -e
lo-main-library libcppunittester -e lo-main-cmdline
/data/data/org.libreoffice.android/lib/libtest_i18npool_test_breakiterator.so
--protector libunoexceptionprotector.so unoexceptionprotector
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/ComponentTarget/i18npool/util/i18npool.component'
-env:LO_LIB_DIR=file:///data/data/org.libreoffice.android/lib
+# Note: these are just examples.
+#
+# The first two ones should work
+ adb shell am start -n org.libreoffice.android/.Bootstrap -e
lo-main-library libcppunittester -e lo-main-cmdline
$(APP_DATA_PATH)/lib/libqa_sal_types.so
+#
+ adb shell am start -n org.libreoffice.android/.Bootstrap -e
lo-main-library libcppunittester -e lo-main-cmdline
$(APP_DATA_PATH)/lib/libtest_i18npool_test_breakiterator.so --protector
libunoexceptionprotector.so unoexceptionprotector
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/ComponentTarget/i18npool/util/i18npool.component'
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib
+#
+# This doesn't work yet
+ adb shell am start -n org.libreoffice.android/.Bootstrap -e
lo-main-library libunoexe -e lo-main-cmdline -ro /assets/lib/uno_services.rdb
-ro /assets/lib/uno_types.rdb -s com.sun.star.test.bridge.BridgeTest --
com.sun.star.test.bridge.CppTestObject -e lo-main-delay 2
commit 42acf7a6d5cf91aed5ed4aa0d9ce09b3d0203b01
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Nov 21 18:03:48 2011 +0200
Don't use USE_DOUBLE_MMAP on Android
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
index 21c335b..c21fb76 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
@@ -39,8 +39,7 @@
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
-|| defined(NETBSD) || defined(DRAGONFLY) \
-|| defined(ANDROID) /* Not sure about Android, but let's see... */
+|| defined(NETBSD) || defined(DRAGONFLY)
#define USE_DOUBLE_MMAP
#endif
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 737824c..9869bb5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/dpobject.hxx |3 ++
sc/source/core/data/dpobject.cxx | 48 ++-
2 files changed, 45 insertions(+), 6 deletions(-)
New commits:
commit d714c17c21bb061672ac0e900644f09380eaa140
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Mon Nov 21 12:08:49 2011 -0500
i#117239: Prevent crash on load with pivot table.
The crash was due to recursive reference of GETPIVOTDATA within the
source range of the pivot table object referring to itself. The
solution is to disable self reference with GETPIVOTDATA function.
BTW, it goes without saying that, using GETPIVOTDATA inside the source
range of the very pivot table that it references is asking for trouble.
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index bd69edb..cc73fcb 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -105,6 +105,7 @@ private:
boolbAllowMove:1;
boolbAlive:1; // false if only used to hold
settings
boolbSettingsChanged:1;
+boolmbEnableGetPivotData:1;
SC_DLLPRIVATE ScDPTableData*GetTableData();
SC_DLLPRIVATE void CreateObjects();
@@ -115,6 +116,8 @@ public:
ScDPObject(const ScDPObject r);
~ScDPObject();
+void EnableGetPivotData(bool b);
+
/**
* When a DP object is alive, it has table output on a sheet. This flag
* doesn't really change the behavior of the object, but is used only for
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 38bf5c5..9c0663d 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -199,7 +199,8 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
mbHeaderLayout(false),
bAllowMove(false),
bAlive(false),
-bSettingsChanged(false)
+bSettingsChanged(false),
+mbEnableGetPivotData(true)
{
}
@@ -219,7 +220,8 @@ ScDPObject::ScDPObject(const ScDPObject r) :
mbHeaderLayout( r.mbHeaderLayout ),
bAllowMove(false),
bAlive(false),
-bSettingsChanged(false)
+bSettingsChanged(false),
+mbEnableGetPivotData(r.mbEnableGetPivotData)
{
if (r.pSaveData)
pSaveData = new ScDPSaveData(*r.pSaveData);
@@ -242,6 +244,11 @@ ScDPObject::~ScDPObject()
ClearSource();
}
+void ScDPObject::EnableGetPivotData(bool b)
+{
+mbEnableGetPivotData = b;
+}
+
void ScDPObject::SetAlive(bool bSet)
{
bAlive = bSet;
@@ -426,6 +433,26 @@ void ScDPObject::CreateOutput()
}
}
+namespace {
+
+class DisableGetPivotData
+{
+ScDPObject mrDPObj;
+bool mbOldState;
+public:
+DisableGetPivotData(ScDPObject rObj, bool bOld) : mrDPObj(rObj),
mbOldState(bOld)
+{
+mrDPObj.EnableGetPivotData(false);
+}
+
+~DisableGetPivotData()
+{
+mrDPObj.EnableGetPivotData(mbOldState);
+}
+};
+
+}
+
ScDPTableData* ScDPObject::GetTableData()
{
if (!mpTableData)
@@ -444,9 +471,16 @@ ScDPTableData* ScDPObject::GetTableData()
OSL_FAIL(no source descriptor);
pSheetDesc = new ScSheetSourceDesc(pDoc); // dummy defaults
}
-const ScDPCache* pCache = pSheetDesc-CreateCache();
-if (pCache)
-pData.reset(new ScSheetDPData(pDoc, *pSheetDesc, pCache));
+
+{
+// Temporarily disable GETPIVOTDATA to avoid having
+// GETPIVOTDATA called onto itself from within the source
+// range.
+DisableGetPivotData aSwitch(*this, mbEnableGetPivotData);
+const ScDPCache* pCache = pSheetDesc-CreateCache();
+if (pCache)
+pData.reset(new ScSheetDPData(pDoc, *pSheetDesc, pCache));
+}
}
// grouping (for cell or database data)
@@ -1047,8 +1081,10 @@ void ScDPObject::GetHeaderPositionData(const ScAddress
rPos, DataPilotTableHead
bool ScDPObject::GetPivotData( ScDPGetPivotDataField rTarget,
const std::vector ScDPGetPivotDataField
rFilters )
{
-CreateOutput(); // create xSource and pOutput if not already
done
+if (!mbEnableGetPivotData)
+return false;
+CreateOutput(); // create xSource and pOutput if not already
done
return pOutput-GetPivotData( rTarget, rFilters );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/osl
sal/osl/unx/system.c | 94 +++
sal/osl/unx/system.h |4 ++
2 files changed, 98 insertions(+)
New commits:
commit fc1c44d1dd70fe60690af3bcd7aae7a154e415ce
Author: Michael Meeks michael.me...@suse.com
Date: Mon Nov 21 17:40:16 2011 +
only build custom gethostbyname for OSX IOS
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 4bb0e46..4041edb 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -33,7 +33,7 @@
static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
/* struct passwd differs on some platforms */
-#if !defined(FREEBSD) || (__FreeBSD_version 601103)
+#if defined(MACOSX) || defined(IOS)
extern int h_errno;
@@ -124,7 +124,7 @@ struct hostent *gethostbyname_r(const char *name, struct
hostent *result,
return res;
}
-#endif /* !defined(FREEBSD) || (__FreeBSD_version 601103) */
+#endif // OSX || IOS
#if defined(MACOSX)
/*
commit 441227374cf285c2e133f8889db244d2f19609c5
Author: Michael Meeks michael.me...@suse.com
Date: Mon Nov 21 17:38:12 2011 +
Revert Remove internal gethostbyname_r implementation. - OSX needs it
This reverts commit af19d9f563667376f759b4526bc1bcb056947394.
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 63d67bc..4bb0e46 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -32,6 +32,100 @@
static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
+/* struct passwd differs on some platforms */
+#if !defined(FREEBSD) || (__FreeBSD_version 601103)
+
+extern int h_errno;
+
+struct hostent *gethostbyname_r(const char *name, struct hostent *result,
+char *buffer, int buflen, int *h_errnop)
+{
+/* buffer layout: name\0
+ * array_of_pointer_to_aliases
+ * NULL
+ * alias1\0...aliasn\0
+ * array_of_pointer_to_addresses
+ * NULL
+ * addr1addr2addr3...addrn
+ */
+ struct hostent* res;
+
+ pthread_mutex_lock(getrtl_mutex);
+
+ if ( (res = gethostbyname(name)) )
+ {
+int nname, naliases, naddr_list, naliasesdata, n;
+char **p, **parray, *data;
+
+/* Check buffer size before copying, we want to leave the
+ * buffers unmodified in case something goes wrong.
+ *
+ * Is this required?
+ */
+
+nname= strlen(res-h_name)+1;
+
+naliases = naddr_list = naliasesdata = 0;
+
+for ( p = res-h_aliases; *p != NULL; p++) {
+naliases++;
+naliasesdata += strlen(*p)+1;
+}
+
+for ( p = res-h_addr_list; *p != NULL; p++)
+naddr_list++;
+
+if ( nname
+ + (naliases+1)*sizeof(char*) + naliasesdata
+ + (naddr_list+1)*sizeof(char*) + naddr_list*res-h_length
+ = buflen )
+{
+memcpy(result, res, sizeof(struct hostent));
+
+strcpy(buffer, res-h_name);
+ result-h_name = buffer;
+buffer += nname;
+
+parray = (char**)buffer;
+result-h_aliases = parray;
+data = buffer + (naliases+1)*sizeof(char*);
+for ( p = res-h_aliases; *p != NULL; p++) {
+n = strlen(*p)+1;
+*parray++ = data;
+memcpy(data, *p, n);
+data += n;
+}
+*parray = NULL;
+buffer = data;
+parray = (char**)buffer;
+result-h_addr_list = parray;
+data = buffer + (naddr_list+1)*sizeof(char*);
+for ( p = res-h_addr_list; *p != NULL; p++) {
+*parray++ = data;
+memcpy(data, *p, res-h_length);
+data += res-h_length;
+}
+*parray = NULL;
+
+ res = result;
+}
+else
+{
+errno = ERANGE;
+res = NULL;
+}
+}
+else
+{
+*h_errnop = h_errno;
+}
+
+pthread_mutex_unlock(getrtl_mutex);
+
+ return res;
+}
+#endif /* !defined(FREEBSD) || (__FreeBSD_version 601103) */
+
#if defined(MACOSX)
/*
* Add support for resolving Mac native alias files (not the same as unix
alias files)
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index d3293ad..c8f4871 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -504,6 +504,10 @@ extern struct spwd *getspnam_r(const char *name, struct
spwd *result,
struct tm *localtime_r(const time_t *timep, struct tm *buffer);
struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
#endif /* !defined FREEBSD || (__FreeBSD_version 500112) */
+#if !defined(FREEBSD) || (__FreeBSD_version 601103)
+struct hostent *gethostbyname_r(const char *name, struct hostent *result,
+char *buffer, int buflen, int *h_errnop);
+#endif /* !defined(FREEBSD) ||
[Libreoffice-commits] .: officecfg/registry sd/source
officecfg/registry/schema/org/openoffice/Office/Impress.xcs |2 +- sd/source/ui/app/optsitem.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 34d89d1ef5830b14d31f1de61d973349e1f2da6c Author: Tim Hardeck thard...@suse.com Date: Fri Nov 18 15:20:10 2011 +0100 Start Impress without the wizard by default This one-liner prevents the Impress Wizard from getting started automatically. The assistant should now only appear if File - Wizards - Presentation is used. diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index 16634f5..2876a29 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -588,7 +588,7 @@ descIndicates whether to show the autopilot when creating a new presentation./desc labelStart with AutoPilots/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=Layout oor:type=xs:boolean !-- OldPath: Impress/Other/New_Doc -- diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index d5eec0a..666ea0d 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -488,7 +488,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : OUString() ), nDefaultObjectSizeWidth(8000), nDefaultObjectSizeHeight(5000), -bStartWithTemplate( sal_True ), +bStartWithTemplate( sal_False ), bMarkedHitMovesAlways( sal_True ), bMoveOnlyDragging( sal_False ), bCrookNoContortion( sal_False ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/osl
sal/osl/unx/backtrace.h |2 --
1 file changed, 2 deletions(-)
New commits:
commit 997ac87c86f8412d8d7e7d7ada8acda347a6f7e9
Author: Michael Meeks michael.me...@suse.com
Date: Mon Nov 21 17:57:44 2011 +
remove extraneous endif.
diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
index 61d63ec..7d097fd 100644
--- a/sal/osl/unx/backtrace.h
+++ b/sal/osl/unx/backtrace.h
@@ -62,8 +62,6 @@ struct frame {
#include execinfo.h
#endif
-#endif /* defined LINUX SPARC */
-
#if defined (MACOSX)
#ifdef __cplusplus
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/lt_LT.xml | 64 +- 1 file changed, 63 insertions(+), 1 deletion(-) New commits: commit a422892eee28eb3d299c61bd0510ff951a8ca64f Author: Modestas Rimkus modestas.rim...@gmail.com Date: Mon Nov 21 20:18:41 2011 +0100 added Lithuanian [lt-LT] nominative / genitive case month names diff --git a/i18npool/source/localedata/data/lt_LT.xml b/i18npool/source/localedata/data/lt_LT.xml index cd4cb0a..99bb042 100644 --- a/i18npool/source/localedata/data/lt_LT.xml +++ b/i18npool/source/localedata/data/lt_LT.xml @@ -260,6 +260,68 @@ Month MonthIDjan/MonthID DefaultAbbrvNameSau/DefaultAbbrvName + DefaultFullNamesausis/DefaultFullName +/Month +Month + MonthIDfeb/MonthID + DefaultAbbrvNameVas/DefaultAbbrvName + DefaultFullNamevasaris/DefaultFullName +/Month +Month + MonthIDmar/MonthID + DefaultAbbrvNameKov/DefaultAbbrvName + DefaultFullNamekovas/DefaultFullName +/Month +Month + MonthIDapr/MonthID + DefaultAbbrvNameBal/DefaultAbbrvName + DefaultFullNamebalandis/DefaultFullName +/Month +Month + MonthIDmay/MonthID + DefaultAbbrvNameGeg/DefaultAbbrvName + DefaultFullNamegegužÄ/DefaultFullName +/Month +Month + MonthIDjun/MonthID + DefaultAbbrvNameBir/DefaultAbbrvName + DefaultFullNamebirželis/DefaultFullName +/Month +Month + MonthIDjul/MonthID + DefaultAbbrvNameLie/DefaultAbbrvName + DefaultFullNameliepa/DefaultFullName +/Month +Month + MonthIDaug/MonthID + DefaultAbbrvNameRgp/DefaultAbbrvName + DefaultFullNamerugpjÅ«tis/DefaultFullName +/Month +Month + MonthIDsep/MonthID + DefaultAbbrvNameRgs/DefaultAbbrvName + DefaultFullNamerugsÄjis/DefaultFullName +/Month +Month + MonthIDoct/MonthID + DefaultAbbrvNameSpl/DefaultAbbrvName + DefaultFullNamespalis/DefaultFullName +/Month +Month + MonthIDnov/MonthID + DefaultAbbrvNameLap/DefaultAbbrvName + DefaultFullNamelapkritis/DefaultFullName +/Month +Month + MonthIDdec/MonthID + DefaultAbbrvNameGrd/DefaultAbbrvName + DefaultFullNamegruodis/DefaultFullName +/Month + /MonthsOfYear + GenitiveMonths +Month + MonthIDjan/MonthID + DefaultAbbrvNameSau/DefaultAbbrvName DefaultFullNamesausio/DefaultFullName /Month Month @@ -317,7 +379,7 @@ DefaultAbbrvNameGrd/DefaultAbbrvName DefaultFullNamegruodžio/DefaultFullName /Month - /MonthsOfYear + /GenitiveMonths Eras Era EraIDbc/EraID ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/linkermapfile-check.awk | 105
1 file changed, 105 deletions(-)
New commits:
commit 5e429334a9998ba254615077a81adca218f89674
Author: Eike Rathke er...@redhat.com
Date: Mon Nov 21 20:49:21 2011 +0100
remove obsolete linkermapfile-check.awk
diff --git a/i18npool/source/localedata/data/linkermapfile-check.awk
b/i18npool/source/localedata/data/linkermapfile-check.awk
deleted file mode 100644
index baa703a..000
--- a/i18npool/source/localedata/data/linkermapfile-check.awk
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/gawk -f
-# Usage: gawk -f linkermapfile-check.awk *.map *.xml
-# Order of *.map *.xml is important, otherwise all symbols are reported to be
-# missing.
-# Checks if all symbols of all locale data are present in the symbol scoping
-# linker mapfiles. Any output indicates a missing symbol, ../localedata.cxx is
-# grep'ed to indicate the library to which mapfile the symbol should be added.
-# Author: Eike Rathke e...@openoffice.org
-
-BEGIN {
-bAnyMissing = 0
-file =
-nMap = 0
-nMaps = 0
-nPublics = 0
-sPublic[nPublics++] = getAllCalendars_
-sPublic[nPublics++] = getAllCurrencies_
-sPublic[nPublics++] = getAllFormats0_
-bOptional[nPublics] = 1 # getAllFormats1 most times not present
-sPublic[nPublics++] = getAllFormats1_
-sPublic[nPublics++] = getBreakIteratorRules_
-sPublic[nPublics++] = getCollationOptions_
-sPublic[nPublics++] = getCollatorImplementation_
-sPublic[nPublics++] = getContinuousNumberingLevels_
-sPublic[nPublics++] = getForbiddenCharacters_
-sPublic[nPublics++] = getLCInfo_
-sPublic[nPublics++] = getLocaleItem_
-sPublic[nPublics++] = getOutlineNumberingLevels_
-sPublic[nPublics++] = getReservedWords_
-sPublic[nPublics++] = getSearchOptions_
-sPublic[nPublics++] = getTransliterations_
-sPublic[nPublics++] = getIndexAlgorithm_
-sPublic[nPublics++] = getUnicodeScripts_
-sPublic[nPublics++] = getFollowPageWords_
-}
-
-file != FILENAME {
-file = FILENAME
-if ( file ~ /\.map$/ )
-{
-sMapFile[nMaps] = file
-nMap = nMaps
-++nMaps
-}
-else if ( file ~ /\.xml$/ )
-{
-bOut = 0
-n = split( file, arr, /[:\\\/.]/ )
-locale = arr[n-1]
-for ( i=0; inPublics; ++i )
-{
-symbol = sPublic[i] locale ;
-bFound = 0
-for ( j=0; jnMaps !bFound; ++j )
-{
-if ( sSymbol[j,symbol] )
-bFound = 1
-}
-if ( !bFound bOptional[i] )
-{
-print symbol not present but optional
-bFound = 1
-}
-if ( !bFound )
-{
-if ( !bOut )
-{
-search = \ locale \
-while ( !bOut (getline ../localedata.cxx) 0 )
-{
-if ( $0 ~ search )
-{
-bOut = 1
-print ../localedata.cxx says this should go into:
$0
-}
-}
-close( ../localedata.cxx )
-if ( !bOut )
-print ../localedata.cxx doesn't indicate to which lib
this belongs to:
-bOut = 1
-}
-print symbol
-}
-}
-if ( bOut)
-{
-printf(\n)
-bAnyMissing = 1
-}
-nextfile
-}
-else
-nextfile
-}
-
-# only reached if .map file encountered, read in symbols
-{
-if ( $1 ~ /;$/ )
-sSymbol[nMap,$1] = 1
-}
-
-END {
-if ( !bAnyMissing )
-print All good. /dev/stderr
-}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/onemsi' - scp2/source solenv/bin
scp2/source/ooo/folderitem_ooo.scp |4
solenv/bin/modules/installer/windows/shortcut.pm |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit cef52ca2c2a950dd5d8cd61deae0fac721989c49
Author: Andras Timar ati...@suse.com
Date: Mon Nov 21 21:41:35 2011 +0100
if silent MSI, put LibreOffice starter icon into Program menu folder
diff --git a/scp2/source/ooo/folderitem_ooo.scp
b/scp2/source/ooo/folderitem_ooo.scp
index db3e5b1..d00148a 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -31,7 +31,11 @@ FolderItem gid_Folderitem_Soffice
Name = %PRODUCTNAME;
Name (pt-BR) = %PRODUCTNAME_BR;
ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+FolderID = PREDEFINED_STARTMENU;
+#else
FolderID = gid_Folder_Staroffice51;
+#endif
FileID = gid_Brand_File_Bin_Soffice;
IconFile = gid_Brand_File_Bin_Soffice;
IconID = 0;
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm
b/solenv/bin/modules/installer/windows/shortcut.pm
index 91e6302..08614c7 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -375,7 +375,7 @@ sub get_folderitem_directory
if ( $shortcut-{'FolderID'} eq PREDEFINED_STARTMENU )
{
-$directory = $installer::globals::startmenufolder;
+$directory = $installer::globals::programmenufolder;
}
# saving the directory in the folderitems collector
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source solenv/bin
scp2/source/ooo/folderitem_ooo.scp |4
solenv/bin/modules/installer/windows/shortcut.pm |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d9f7b43af4db6352239dd706d8920e02114b0510
Author: Andras Timar ati...@suse.com
Date: Mon Nov 21 22:18:20 2011 +0100
if silent MSI, put LibreOffice starter icon to Program menu folder
diff --git a/scp2/source/ooo/folderitem_ooo.scp
b/scp2/source/ooo/folderitem_ooo.scp
index 3c41948..7381735 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -30,7 +30,11 @@
FolderItem gid_Folderitem_Soffice
Name = %PRODUCTNAME;
ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+FolderID = PREDEFINED_STARTMENU;
+#else
FolderID = gid_Folder_Staroffice51;
+#endif
FileID = gid_Brand_File_Bin_Soffice;
IconFile = gid_Brand_File_Bin_Soffice;
IconID = 0;
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm
b/solenv/bin/modules/installer/windows/shortcut.pm
index cb62a0a..6c73f77 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -375,7 +375,7 @@ sub get_folderitem_directory
if ( $shortcut-{'FolderID'} eq PREDEFINED_STARTMENU )
{
-$directory = $installer::globals::startmenufolder;
+$directory = $installer::globals::programmenufolder;
}
# saving the directory in the folderitems collector
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/lomenubar/FrameJob.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 487968707f9ea36f3873a9349ebb87655f6abb3d
Author: August Sodora aug...@gmail.com
Date: Mon Nov 21 19:56:51 2011 -0500
cppcheck: C-style pointer casting
diff --git a/framework/source/lomenubar/FrameJob.cxx
b/framework/source/lomenubar/FrameJob.cxx
index 06af939..fd9d5da 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -153,7 +153,7 @@ on_registrar_available (GDBusConnection * /*connection*/,
GError *error = NULL;
GDBusProxy *proxy;
-FrameHelper *helper = (FrameHelper*)user_data;
+FrameHelper *helper = static_castFrameHelper*(user_data);
unsigned long xid = helper-getXID();
proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
@@ -207,7 +207,7 @@ on_registrar_unavailable (GDBusConnection * /*connection*/,
//TODO: Unregister window?
// Show menubar
-FrameHelper *helper = (FrameHelper*)user_data;
+FrameHelper *helper = static_castFrameHelper*(user_data);
Reference XFrame xFrame = helper-getFrame ();
Reference XPropertySet frameProps (xFrame, UNO_QUERY);
Reference XLayoutManager
xLayoutManager(frameProps-getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(LayoutManager))),
@@ -343,8 +343,9 @@ FrameJob::getRootMenuitem (Reference XMenu xMenu,
gpointer helper)
{
DbusmenuMenuitem *root = dbusmenu_menuitem_new_with_id (0);
-((FrameHelper*)helper)-setRootItem(root);
-((FrameHelper*)helper)-rebuildMenu (xMenu, root);
+FrameHelper* fHelper = static_castFrameHelper*(helper);
+fHelper-setRootItem(root);
+fHelper-rebuildMenu (xMenu, root);
return root;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basicbox.cxx |4 ++--
basctl/source/basicide/baside2.hxx |2 +-
basctl/source/basicide/baside2b.cxx | 15 +++
basctl/source/basicide/basobj2.cxx |4 ++--
basctl/source/basicide/moduldl2.cxx |2 +-
5 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit ea1c1ad843d219bc2e6d99d72998eb8a00805493
Author: August Sodora aug...@gmail.com
Date: Mon Nov 21 20:13:24 2011 -0500
cppcheck: C-style pointer casting
diff --git a/basctl/source/basicide/basicbox.cxx
b/basctl/source/basicide/basicbox.cxx
index 2a5a7ca..7e20bca 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -328,7 +328,7 @@ void BasicLibBox::Select()
void BasicLibBox::NotifyIDE()
{
sal_uInt16 nSelPos = GetSelectEntryPos();
-BasicLibEntry* pEntry = (BasicLibEntry*)GetEntryData( nSelPos );
+BasicLibEntry* pEntry = static_castBasicLibEntry*(GetEntryData( nSelPos
));
if ( pEntry )
{
ScriptDocument aDocument( pEntry-GetDocument() );
@@ -352,7 +352,7 @@ void BasicLibBox::ClearBox()
sal_uInt16 nCount = GetEntryCount();
for ( sal_uInt16 i = 0; i nCount; ++i )
{
-BasicLibEntry* pEntry = (BasicLibEntry*)GetEntryData( i );
+BasicLibEntry* pEntry = static_castBasicLibEntry*(GetEntryData( i ));
delete pEntry;
}
ListBox::Clear();
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 48a65c9..ebf501e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -148,7 +148,7 @@ public:
EditorWindow( Window* pParent );
~EditorWindow();
-ExtTextEngine* GetEditEngine() const { return
(ExtTextEngine*)pEditEngine; }
+ExtTextEngine* GetEditEngine() const { return pEditEngine; }
ExtTextView*GetEditView() const { return pEditView; }
ProgressInfo* GetProgress() const { return pProgress; }
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 1fb174a..ac42db8 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -769,7 +769,7 @@ void EditorWindow::ImpDoHighlight( sal_uLong nLine )
for ( size_t i = 0; i aPortions.size(); i++ )
{
HighlightPortion r = aPortions[i];
-const Color rColor =
((ModulWindowLayout*)pModulWindow-GetLayoutWindow())-getSyntaxColor(r.tokenType);
+const Color rColor =
dynamic_castModulWindowLayout*(pModulWindow-GetLayoutWindow())-getSyntaxColor(r.tokenType);
pEditEngine-SetAttrib( TextAttribFontColor( rColor ), nLine,
r.nBegin, r.nEnd, sal_True );
}
@@ -960,10 +960,10 @@ void BreakPointWindow::Paint( const Rectangle )
Size aOutSz( GetOutputSize() );
long nLineHeight = GetTextHeight();
-Image aBrk1(((ModulWindowLayout *) pModulWindow-GetLayoutWindow())-
-getImage(IMGID_BRKENABLED));
-Image aBrk0(((ModulWindowLayout *) pModulWindow-GetLayoutWindow())-
-getImage(IMGID_BRKDISABLED));
+ModulWindowLayout* pModulWindowLayout =
dynamic_castModulWindowLayout*(pModulWindow-GetLayoutWindow());
+
+Image aBrk1(pModulWindowLayout-getImage(IMGID_BRKENABLED));
+Image aBrk0(pModulWindowLayout-getImage(IMGID_BRKDISABLED));
Size aBmpSz( aBrk1.GetSizePixel() );
aBmpSz = PixelToLogic( aBmpSz );
Point aBmpOff( 0, 0 );
@@ -1009,9 +1009,8 @@ void BreakPointWindow::ShowMarker( sal_Bool bShow )
Size aOutSz( GetOutputSize() );
long nLineHeight = GetTextHeight();
-Image aMarker(((ModulWindowLayout*)pModulWindow-GetLayoutWindow())-
- getImage(bErrorMarker
- ? IMGID_ERRORMARKER : IMGID_STEPMARKER));
+ModulWindowLayout* pModulWindowLayout =
dynamic_castModulWindowLayout*(pModulWindow-GetLayoutWindow());
+Image aMarker(pModulWindowLayout-getImage(bErrorMarker ?
IMGID_ERRORMARKER : IMGID_STEPMARKER));
Size aMarkerSz( aMarker.GetSizePixel() );
aMarkerSz = PixelToLogic( aMarkerSz );
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index 7954b09..68a40f6 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -205,7 +205,7 @@ bool RenameModule( Window* pErrorParent, const
ScriptDocument rDocument, const
pWin-SetName( rNewName );
// set new module in module window
-ModulWindow* pModWin = (ModulWindow*)pWin;
+ModulWindow* pModWin = dynamic_castModulWindow*(pWin);
pModWin-SetSbModule( (SbModule*)pModWin-GetBasic()-FindModule(
rNewName ) );
// update tabwriter
@@ -308,7 +308,7 @@ namespace
SbModule* pModule = pMethod-GetModule();
ENSURE_OR_BREAK( pModule, BasicIDE::ChooseMacro: No Module
found! );
-StarBASIC* pBasic =
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/linenumberwindow.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit a7c455d10148f6562583f034147b600d61500af1 Author: August Sodora aug...@gmail.com Date: Mon Nov 21 20:15:25 2011 -0500 unused local variable diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index 39041b9..48c2414 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -38,7 +38,6 @@ private: ModulWindow* m_pModulWindow; int m_nWidth; long m_nCurYOffset; -int m_nCharWidth; int m_nBaseWidth; virtual void DataChanged(DataChangedEvent const rDCEvt); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/dlged/dlgedobj.cxx | 33 ++--- 1 file changed, 10 insertions(+), 23 deletions(-) New commits: commit 59e4b21c6723066f30a1a34a8fd25eb01fb66fc4 Author: August Sodora aug...@gmail.com Date: Mon Nov 21 20:28:01 2011 -0500 Removed unnecessary includes diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 11a892c..7b8bdc9 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -29,37 +29,25 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include precompiled_basctl.hxx -#include vector -#include dlgeddef.hxx -#include dlgedobj.hxx #include dlged.hxx -#include dlgedmod.hxx +#include dlgeddef.hxx +#include dlgedlist.hxx +#include dlgedobj.hxx #include dlgedpage.hxx #include dlgedview.hxx -#include dlgedlist.hxx -#include iderid.hxx -#include localizationmgr.hxx +#include iderid.hxx +#include localizationmgr.hxx + +#include dlgresid.hrc -#include dlgresid.hrc -#include tools/resmgr.hxx -#include tools/shl.hxx -#include unotools/sharedunocomponent.hxx -#include com/sun/star/awt/XTabControllerModel.hpp #include com/sun/star/awt/XUnoControlContainer.hpp #include com/sun/star/awt/XVclContainerPeer.hpp -#include com/sun/star/awt/XWindow.hpp -#include com/sun/star/beans/XPropertySet.hpp -#include com/sun/star/beans/PropertyAttribute.hpp -#include com/sun/star/script/XScriptEventsSupplier.hpp #include com/sun/star/container/XContainer.hpp #include com/sun/star/lang/XServiceInfo.hpp -#include comphelper/processfactory.hxx -#include comphelper/types.hxx -#include vcl/svapp.hxx - -#include algorithm -#include functional +#include com/sun/star/script/XScriptEventsSupplier.hpp #include o3tl/compat_functional.hxx +#include unotools/sharedunocomponent.hxx +#include vcl/svapp.hxx using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -68,7 +56,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::script; using ::rtl::OUString; - TYPEINIT1(DlgEdObj, SdrUnoObj); DBG_NAME(DlgEdObj); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/dlged/propbrw.cxx | 42 ++-- 1 file changed, 11 insertions(+), 31 deletions(-) New commits: commit 48ea07772907b7a6112b614b4f7216b357d6c43a Author: August Sodora aug...@gmail.com Date: Mon Nov 21 20:36:23 2011 -0500 Removed unnecessary includes diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index d192aba..50d5b03 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -29,42 +29,24 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include precompiled_basctl.hxx -#include sal/macros.h -#include propbrw.hxx -#include dlgedobj.hxx - #include basidesh.hxx -#include iderid.hxx - -#include dlgresid.hrc -#include tools/debug.hxx -#include tools/diagnose_ex.h -#include sfx2/bindings.hxx -#include sfx2/childwin.hxx -#include sfx2/objitem.hxx +#include dlgedobj.hxx +#include iderid.hxx +#include propbrw.hxx +#include dlgresid.hrc #include svx/svxids.hrc -#include tools/shl.hxx -#include vcl/stdtext.hxx -#include svx/svdview.hxx -#include svx/svdogrp.hxx -#include svx/svdpage.hxx -#include svx/svditer.hxx -#include sfx2/viewsh.hxx -#include toolkit/unohlp.hxx -#include comphelper/property.hxx -#include comphelper/stl_types.hxx -#include comphelper/types.hxx -#include com/sun/star/beans/PropertyValue.hpp #include com/sun/star/awt/PosSize.hpp -#include com/sun/star/lang/XServiceInfo.hpp #include com/sun/star/inspection/XObjectInspector.hpp -#include comphelper/processfactory.hxx +#include com/sun/star/lang/XServiceInfo.hpp +#include comphelper/types.hxx #include cppuhelper/component_context.hxx - -#include sfx2/dispatch.hxx -#include sfx2/viewfrm.hxx +#include svx/svditer.hxx +#include svx/svdview.hxx +#include toolkit/unohlp.hxx +#include tools/diagnose_ex.h +#include vcl/stdtext.hxx using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -74,10 +56,8 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::comphelper; - SFX_IMPL_FLOATINGWINDOW(PropBrwMgr, SID_SHOW_PROPERTYBROWSER) - PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo) :SfxChildWindow( _pParent, nId ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basctl/source
basctl/source/dlged/dlgedobj.cxx |4 ++--
basctl/source/dlged/managelang.cxx | 30 +++---
basctl/source/dlged/propbrw.cxx|2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit cbde0ff28bcf9cf0271324fae879df39c2710f48
Author: August Sodora aug...@gmail.com
Date: Mon Nov 21 23:58:02 2011 -0500
String-OUString
diff --git a/basctl/source/dlged/managelang.cxx
b/basctl/source/dlged/managelang.cxx
index f95bbb5..a286d7a 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -42,6 +42,7 @@
#include com/sun/star/i18n/XBreakIterator.hpp
#include com/sun/star/i18n/WordType.hpp
+#include comphelper/string.hxx
#include editeng/unolingu.hxx
#include sfx2/bindings.hxx
#include svtools/langtab.hxx
@@ -63,7 +64,7 @@ bool localesAreEqual( const Locale rLocaleLeft, const
Locale rLocaleRight )
}
namespace {
-long getLongestWordWidth( const String rText, const Window rWin )
+long getLongestWordWidth( const ::rtl::OUString rText, const Window rWin
)
{
long nWidth = 0;
Reference XBreakIterator xBreakIter(
vcl::unohelper::CreateBreakIterator() );
@@ -75,9 +76,7 @@ namespace {
while ( aBoundary.startPos != aBoundary.endPos )
{
nStartPos = aBoundary.endPos;
-String sWord( rText.Copy(
-(sal_uInt16)aBoundary.startPos,
-(sal_uInt16)aBoundary.endPos - (sal_uInt16)aBoundary.startPos
) );
+::rtl::OUString sWord(rText.copy(aBoundary.startPos,
aBoundary.endPos - aBoundary.startPos));
long nTemp = rWin.GetCtrlTextWidth( sWord );
if ( nTemp nWidth )
nWidth = nTemp;
@@ -124,10 +123,10 @@ void ManageLanguageDialog::Init()
{
// get current IDE
BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
-String sLibName = pIDEShell-GetCurLibName();
+::rtl::OUString sLibName = pIDEShell-GetCurLibName();
// set dialog title with library name
-String sText = GetText();
-sText.SearchAndReplace( String::CreateFromAscii($1), sLibName );
+::rtl::OUString sText = GetText();
+::comphelper::string::replace(sText,
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM($1)), sLibName);
SetText( sText );
// set handler
m_aAddPB.SetClickHdl( LINK( this, ManageLanguageDialog, AddHdl ) );
@@ -141,7 +140,7 @@ void ManageLanguageDialog::Init()
void ManageLanguageDialog::CalcInfoSize()
{
-String sInfoStr = m_aInfoFT.GetText();
+::rtl::OUString sInfoStr = m_aInfoFT.GetText();
long nInfoWidth = m_aInfoFT.GetSizePixel().Width();
long nLongWord = getLongestWordWidth( sInfoStr, m_aInfoFT );
long nTxtWidth = m_aInfoFT.GetCtrlTextWidth( sInfoStr ) + nLongWord;
@@ -183,12 +182,13 @@ void ManageLanguageDialog::FillLanguageBox()
{
bool bIsDefault = localesAreEqual( aDefaultLocale, pLocale[i] );
LanguageType eLangType = SvxLocaleToLanguage( pLocale[i] );
-String sLanguage = aLangTable.GetString( eLangType );
+::rtl::OUStringBuffer sLanguageBuf(aLangTable.GetString( eLangType
));
if ( bIsDefault )
{
-sLanguage += ' ';
-sLanguage += m_sDefLangStr;
+sLanguageBuf.append(' ');
+sLanguageBuf.append(m_sDefLangStr);
}
+::rtl::OUString sLanguage(sLanguageBuf.makeStringAndClear());
sal_uInt16 nPos = m_aLanguageLB.InsertEntry( sLanguage );
m_aLanguageLB.SetEntryData( nPos, new LanguageEntry( sLanguage,
pLocale[i], bIsDefault ) );
}
@@ -315,9 +315,9 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window*
pParent, Localizatio
// change to Add Interface Language mode
SetHelpId( HID_BASICIDE_ADDNEW_LANGUAGE );
m_pCheckLangLB = new SvxCheckListBox( this, IDEResId( LB_ADD_LANGUAGE
) );
-SetText( String( IDEResId( STR_ADDLANG_TITLE ) ) );
-m_aLanguageFT.SetText( String( IDEResId( STR_ADDLANG_LABEL ) ) );
-m_aInfoFT.SetText( String( IDEResId( STR_ADDLANG_INFO ) ) );
+SetText( ResId::toString( IDEResId( STR_ADDLANG_TITLE ) ) );
+m_aLanguageFT.SetText( ResId::toString( IDEResId( STR_ADDLANG_LABEL )
) );
+m_aInfoFT.SetText( ResId::toString( IDEResId( STR_ADDLANG_INFO ) ) );
}
FreeResource();
@@ -362,7 +362,7 @@ void SetDefaultLanguageDialog::FillLanguageBox()
void SetDefaultLanguageDialog::CalcInfoSize()
{
-String sInfoStr = m_aInfoFT.GetText();
+::rtl::OUString sInfoStr = m_aInfoFT.GetText();
long nInfoWidth = m_aInfoFT.GetSizePixel().Width();
long nLongWord = getLongestWordWidth( sInfoStr, m_aInfoFT );
long nTxtWidth = m_aInfoFT.GetCtrlTextWidth( sInfoStr ) + nLongWord;
commit 89e27727c9b7cfd4e74a007a3390052cd1c13afb
Author: August Sodora aug...@gmail.com
Date: Mon Nov 21 23:54:04 2011 -0500
String-OUString
[Libreoffice-commits] .: sc/source
sc/source/core/inc/interpre.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9bf4bb78806683d64514928b7b091634003efea8
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Nov 22 00:05:59 2011 -0500
fdo#40990: Compare the wrapped pointer values.
Or else the pTokenMatrixMap would never yield any match. This was
the only reason behind the poor performance of resolving jump matrix
as exhibited in the aforementioned bug...
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3892eaa..d35b53d 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -80,7 +80,7 @@ enum ScIterFunc {
struct FormulaTokenRef_less
{
bool operator () ( const formula::FormulaConstTokenRef r1, const
formula::FormulaConstTokenRef r2 ) const
-{ return r1 r2; }
+{ return r1.get() r2.get(); }
};
typedef ::std::map const formula::FormulaConstTokenRef,
formula::FormulaTokenRef, FormulaTokenRef_less ScTokenMatrixMap;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/tool/scmatrix.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0146b05aad4385a31bd7ae8aaed0dd29d666d131
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Nov 22 00:13:07 2011 -0500
This is wrong. We should allow both boolean and numeric types.
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index dea2c28..9b79fda 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -114,7 +114,8 @@ void compareMatrix(MatrixImplType rMat)
for (size_t j = 0; j aDim.second; ++j)
{
matrix_element_t eType = rMat.get_type(i, j);
-if (eType != mdds::element_numeric eType ==
mdds::element_boolean)
+if (eType != mdds::element_numeric eType !=
mdds::element_boolean)
+// must be of numeric type (boolean can be numeric).
continue;
double fVal = rMat.get_numeric(i, j);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basctl/source
basctl/source/accessibility/accessibledialogwindow.cxx |2
basctl/source/basicide/baside2.cxx |4
basctl/source/basicide/basides2.cxx|4
basctl/source/basicide/bastype2.cxx| 90 -
basctl/source/basicide/bastype2.hxx| 48 -
basctl/source/basicide/bastype3.cxx|7 -
basctl/source/basicide/macrodlg.cxx|4
basctl/source/basicide/moduldlg.cxx|2
basctl/source/dlged/dlged.cxx |6 -
basctl/source/inc/bastypes.hxx |4
basctl/source/inc/dlged.hxx|4
11 files changed, 87 insertions(+), 88 deletions(-)
New commits:
commit 8061b40349c1251362c984b76aaa90b9510fba4f
Author: August Sodora aug...@gmail.com
Date: Tue Nov 22 00:20:15 2011 -0500
String-OUString
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 8b4228f..3584e6e 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -243,7 +243,7 @@ sal_Bool AccessibleDialogWindow::IsChildVisible( const
ChildDescriptor rDesc )
const SdrLayer* pSdrLayer = rLayerAdmin.GetLayerPerID(
nLayerId );
if ( pSdrLayer )
{
-String aLayerName = pSdrLayer-GetName();
+::rtl::OUString aLayerName = pSdrLayer-GetName();
SdrView* pSdrView = m_pDialogWindow-GetView();
if ( pSdrView pSdrView-IsLayerVisible( aLayerName ) )
{
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 101a8a8..8b57961 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1350,9 +1350,9 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
uno::Reference container::XNameContainer xLib =
aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
if( xLib.is() )
{
-String sObjName;
+::rtl::OUString sObjName;
ModuleInfoHelper::getObjectName( xLib, aModName, sObjName
);
-if( sObjName.Len() )
+if( !sObjName.isEmpty() )
{
aModName.AppendAscii(
().Append(sObjName).AppendAscii());
}
diff --git a/basctl/source/basicide/basides2.cxx
b/basctl/source/basicide/basides2.cxx
index 7754d9a..81e325c 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -248,9 +248,9 @@ ModulWindow* BasicIDEShell::CreateBasWin( const
ScriptDocument rDocument, const
{
// display a nice friendly name in the ObjectModule tab,
// combining the objectname and module name, e.g. Sheet1 ( Financials )
-String sObjName;
+::rtl::OUString sObjName;
ModuleInfoHelper::getObjectName( xLib, rModName, sObjName );
-if( sObjName.Len() )
+if( !sObjName.isEmpty() )
{
aModName.AppendAscii( ().Append(sObjName).AppendAscii());
}
diff --git a/basctl/source/basicide/bastype2.cxx
b/basctl/source/basicide/bastype2.cxx
index 9820cc1..531dbbf 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -61,7 +61,7 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-void ModuleInfoHelper::getObjectName( const uno::Reference
container::XNameContainer rLib, const String rModName, String rObjName )
+void ModuleInfoHelper::getObjectName( const uno::Reference
container::XNameContainer rLib, const ::rtl::OUString rModName,
::rtl::OUString rObjName )
{
try
{
@@ -84,7 +84,7 @@ void ModuleInfoHelper::getObjectName( const uno::Reference
container::XNameCont
}
}
-sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference
container::XNameContainer rLib, const String rModName )
+sal_Int32 ModuleInfoHelper::getModuleType( const uno::Reference
container::XNameContainer rLib, const ::rtl::OUString rModName )
{
sal_Int32 nType = script::ModuleType::NORMAL;
uno::Reference script::vba::XVBAModuleInfo xVBAModuleInfo( rLib,
uno::UNO_QUERY );
@@ -112,7 +112,7 @@ BasicDocumentEntry::~BasicDocumentEntry()
{
}
-BasicLibEntry::BasicLibEntry( const ScriptDocument rDocument, LibraryLocation
eLocation, const String rLibName, BasicEntryType eType )
+BasicLibEntry::BasicLibEntry( const ScriptDocument rDocument, LibraryLocation
eLocation, const ::rtl::OUString rLibName, BasicEntryType eType )
:BasicDocumentEntry( rDocument, eLocation, eType )
,m_aLibName( rLibName )
{
@@ -129,7 +129,7 @@ BasicEntryDescriptor::BasicEntryDescriptor()
{
}
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/read.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit f2972242673cc9608960e9ca70e82766be5275e3
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Tue Nov 22 01:03:11 2011 -0500
i#115255: Skip invalid record(s) where BOF is expected.
Some 3rd party (Russian?) programs generate broken xls docs which
cause Calc to hang when it tries to open it. This particular doc
placed invalid record at position indicated by BOUNDSHEET, where BOF
was expected. Let's skip those invalid records.
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index d68fc51..8b7eaca 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -848,6 +848,14 @@ FltError ImportExcel8::Read( void )
nProgressBaseSize += (aIn.GetSvStreamPos() - nProgressBasePos);
nProgressBasePos = maSheetOffsets[ nScTab ];
aIn.StartNextRecord( nProgressBasePos );
+while (aIn.GetRecId() != EXC_ID5_BOF)
+{
+// i#115255 Some malformed documents generated by 3rd
+// party Russian program(s) occasionally insert non BOF
+// record(s) at position indicated by BOUNDSHEET. Skip
+// them.
+aIn.StartNextRecord();
+}
}
else
eAkt = EXC_STATE_END;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
