[Libreoffice-commits] .: sc/qa
sc/qa/extras/xcellrangesquery.cxx |8
1 file changed, 8 deletions(-)
New commits:
commit eb251522ebe462903c96881ae9b99814700c84d3
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 1 09:44:57 2011 +0100
-Werror=unused-parameter fix (completely removed unused setRowVisible())
diff --git a/sc/qa/extras/xcellrangesquery.cxx
b/sc/qa/extras/xcellrangesquery.cxx
index 9fc9139..5df4f71 100644
--- a/sc/qa/extras/xcellrangesquery.cxx
+++ b/sc/qa/extras/xcellrangesquery.cxx
@@ -47,8 +47,6 @@ public:
uno::Referencesheet::XCellRangesQuery init();
-void setRowVisible(bool bVisible);
-
//Testcases
void testQueryColumnDifference();
void testQueryContentDifference();
@@ -158,7 +156,6 @@ void ScXCellRangesQuery::testQueryRowDifference()
void ScXCellRangesQuery::testQueryVisibleCells()
{
-setRowVisible(false);
rtl::OUString aExpected(RTL_CONSTASCII_USTRINGPARAM(Sheet1.A2));
uno::Referencesheet::XCellRangesQuery xCellRangesQuery = init();
uno::Referencesheet::XSheetCellRanges xRanges =
xCellRangesQuery-queryVisibleCells();
@@ -167,11 +164,6 @@ void ScXCellRangesQuery::testQueryVisibleCells()
CPPUNIT_ASSERT_MESSAGE(testQueryFormulaCells, aResult == aExpected);
}
-void ScXCellRangesQuery::setRowVisible(bool bVisible)
-{
-
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(ScXCellRangesQuery);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Module.mk |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 08c9b47805dbb3c9ecba408bbf2accdfe3dbe2b9 Author: Tor Lillqvist t...@iki.fi Date: Thu Dec 1 11:09:53 2011 +0200 Fix typos in hint and make more readable diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index c0f8ffd..c061099 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -105,8 +105,11 @@ define gb_Module_DEVINSTALLHINT Developer installation finished, you can now execute: -make debugrun # on Linux -dopen $(SRCDIR)/install/LibreOffice.app # on OSX +on Linux: +make debugrun + +on Mac OS X: +open install/LibreOffice.app endef else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/source chart2/source connectivity/source dbaccess/source oox/source registry/source sal/rtl scaddins/source sc/source sdext/source svl/source tools/source vcl/unx xmlo
basegfx/source/polygon/b2dsvgpolypolygon.cxx|4 +--
chart2/source/tools/TitleHelper.cxx |2 -
chart2/source/view/main/ShapeFactory.cxx|3 --
connectivity/source/parse/sqlnode.cxx | 12 -
dbaccess/source/filter/xml/xmlExport.cxx|4 +--
oox/source/xls/worksheetbuffer.cxx |2 -
registry/source/keyimpl.cxx |2 -
sal/rtl/source/uri.cxx |2 -
sc/source/ui/Accessibility/AccessibleCsvControl.cxx |6 ++--
scaddins/source/datefunc/datefunc.cxx |2 -
sdext/source/pdfimport/tree/writertreevisiting.cxx |7 +++--
svl/source/misc/urihelper.cxx |2 -
tools/source/fsys/urlobj.cxx| 13 --
vcl/unx/x11/x11sys.cxx |4 +--
xmloff/source/style/xmlnumfi.cxx| 26 ++--
15 files changed, 45 insertions(+), 46 deletions(-)
New commits:
commit 443a7229f96806e6bbece775cc7cd643e1c4a042
Author: August Sodora aug...@gmail.com
Date: Mon Nov 28 21:44:30 2011 -0500
Remove uses of charAt
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 931c344..7a34219 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -190,9 +190,9 @@ namespace basegfx
fValue -= fOldValue;
const sal_Int32 aLen( rStr.getLength() );
-if(aLen)
+if(aLen 0)
{
-if( lcl_isOnNumberChar(rStr.charAt(aLen - 1), false)
+if( lcl_isOnNumberChar(rStr[aLen - 1], false)
fValue = 0.0 )
{
rStr.append( sal_Unicode(' ') );
diff --git a/chart2/source/tools/TitleHelper.cxx
b/chart2/source/tools/TitleHelper.cxx
index 09a4b18..7a7a6ae 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -285,7 +285,7 @@ void TitleHelper::setCompleteString( const rtl::OUString
rNewText
sal_Int32 nLen = rNewText.getLength();
for( sal_Int32 nPos = 0; nPos nLen; ++nPos )
{
-sal_Unicode aChar = aSource.charAt( nPos );
+sal_Unicode aChar = aSource[nPos];
if( aChar != '\n' )
{
aUnstackedStr.append( aChar );
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index 40f2536..e6ba468 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2245,7 +2245,6 @@ rtl::OUString ShapeFactory::getStackedString( const
rtl::OUString rString, bool
return rString;
rtl::OUStringBuffer aStackStr;
-rtl::OUStringBuffer aSource(rString);
//add a newline after each letter
//as we do not no letters here add a newline after each char
@@ -2253,7 +2252,7 @@ rtl::OUString ShapeFactory::getStackedString( const
rtl::OUString rString, bool
{
if( nPosSrc )
aStackStr.append( sal_Unicode('\r') );
-aStackStr.append( aSource.charAt( nPosSrc ) );
+aStackStr.append(rString[nPosSrc]);
}
return aStackStr.makeStringAndClear();
}
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 5571bb6..dfc3796 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2464,15 +2464,15 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer
rString, const SQLParseNode
rString.append(SetQuotation(m_aNodeValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\')),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\'\';
break;
case SQL_NODE_NAME:
-if (rString.getLength())
+if (rString.getLength() 0)
{
-switch(rString.charAt(rString.getLength()-1) )
+switch(rString[rString.getLength()-1])
{
case ' ' :
case '.' : break;
default :
if (
!rParam.aMetaData.getCatalogSeparator().getLength()
-|| rString.charAt( rString.getLength()-1 ) !=
rParam.aMetaData.getCatalogSeparator().toChar()
+|| rString[rString.getLength() - 1] !=
rParam.aMetaData.getCatalogSeparator().toChar()
)
rString.appendAscii( ); break;
}
@@ -2520,15 +2520,15 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer
rString, const SQLParseNode
}
// fall through
default:
-if (rString.getLength() m_aNodeValue.toChar() != '.'
m_aNodeValue.toChar() != ':' )
+if
[Libreoffice-commits] .: sc/source
sc/source/core/data/documen3.cxx |9 ++---
sc/source/core/data/documen5.cxx |6 --
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit eec4e1202d5f2f39ad881ce4afd94b8384c8b3c2
Author: Laurent Godard lgodard.li...@laposte.net
Date: Thu Dec 1 10:17:05 2011 +0100
avoid Tabs size calculation in loops
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 545e7f4..63d926a 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -656,7 +656,8 @@ bool ScDocument::HasSheetEventScript( SCTAB nTab, sal_Int32
nEvent, bool bWithVb
bool ScDocument::HasAnySheetEventScript( sal_Int32 nEvent, bool bWithVbaEvents
) const
{
-for (SCTAB nTab = 0; nTab static_castSCTAB(maTabs.size()); nTab++)
+SCTAB nSize = static_castSCTAB(maTabs.size());
+for (SCTAB nTab = 0; nTab nSize; nTab++)
if (HasSheetEventScript( nTab, nEvent, bWithVbaEvents ))
return true;
return false;
@@ -664,7 +665,8 @@ bool ScDocument::HasAnySheetEventScript( sal_Int32 nEvent,
bool bWithVbaEvents )
bool ScDocument::HasAnyCalcNotification() const
{
-for (SCTAB nTab = 0; nTab static_castSCTAB(maTabs.size()); nTab++)
+SCTAB nSize = static_castSCTAB(maTabs.size());
+for (SCTAB nTab = 0; nTab nSize; nTab++)
if (maTabs[nTab] maTabs[nTab]-GetCalcNotification())
return true;
return false;
@@ -686,7 +688,8 @@ void ScDocument::SetCalcNotification( SCTAB nTab )
void ScDocument::ResetCalcNotifications()
{
-for (SCTAB nTab = 0; nTab static_castSCTAB(maTabs.size()); nTab++)
+SCTAB nSize = static_castSCTAB(maTabs.size());
+for (SCTAB nTab = 0; nTab nSize; nTab++)
if (maTabs[nTab] maTabs[nTab]-GetCalcNotification())
maTabs[nTab]-SetCalcNotification(false);
}
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 9540c9f..4a1c2b4 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -133,7 +133,8 @@ void ScDocument::UpdateAllCharts()
size_t nDataCount = pChartCollection-size();
-for (SCTAB nTab=0; nTab static_castSCTAB(maTabs.size()); nTab++)
+SCTAB nSize = static_castSCTAB(maTabs.size());
+for (SCTAB nTab=0; nTab nSize; nTab++)
{
if (maTabs[nTab])
{
@@ -247,7 +248,8 @@ uno::Reference chart2::XChartDocument
ScDocument::GetChartByName( const rtl::
if (pDrawLayer)
{
sal_uInt16 nCount = pDrawLayer-GetPageCount();
-for (sal_uInt16 nTab=0; nTabnCount nTab
static_castSCTAB(maTabs.size()); nTab++)
+SCTAB nSize = static_castSCTAB(maTabs.size());
+for (sal_uInt16 nTab=0; nTabnCount nTab nSize; nTab++)
{
SdrPage* pPage = pDrawLayer-GetPage(nTab);
OSL_ENSURE(pPage,Page ?);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source
sdext/source/pdfimport/tree/writertreevisiting.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cf58b6f81d042783fd9bf79d66deaf974565ea45
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Dec 1 12:29:10 2011 +0100
fix typo
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx
b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 310c133..c8101f9 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -759,7 +759,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element
rParent)
if( !bRotatedFrame
! rCurGC.isRotatedOrSkewed()
! rNextGC.isRotatedOrSkewed()
- pNext-Text.gerLength() 0
+ pNext-Text.getLength() 0
pNext-Text[0] != sal_Unicode(' ')
pCur-Text.getLength() 0
pCur-Text[pCur-Text.getLength() - 1] != sal_Unicode('
')
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/dialog/wordcountdialog.src | 53
1 file changed, 27 insertions(+), 26 deletions(-)
New commits:
commit 52d5644828ac5528d8b5fe6dd644669364f35bce
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Mon Nov 28 19:07:21 2011 +0100
Some changes to the Word Count UI
diff --git a/sw/source/ui/dialog/wordcountdialog.src
b/sw/source/ui/dialog/wordcountdialog.src
index 7d95371..7c4a5f9 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -32,7 +32,7 @@ ModelessDialog DLG_WORDCOUNT
HelpID = HID_DLG_WORDCOUNT ;
OutputSize = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 170 , 132 ) ;
+Size = MAP_APPFONT ( 170 , 136 ) ;
Text [ en-US ] = Word Count ;
Moveable = TRUE ;
@@ -42,102 +42,103 @@ ModelessDialog DLG_WORDCOUNT
FixedLine FL_CURRENT
{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 158 , 8 ) ;
+Pos = MAP_APPFONT ( 5 , 5 ) ;
+Size = MAP_APPFONT ( 160 , 8 ) ;
Text [ en-US ] = Current selection;
};
FixedText FT_CURRENTWORD
{
-Pos = MAP_APPFONT ( 12 , 14 ) ;
+Pos = MAP_APPFONT ( 10 , 16 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Words:;
};
FixedText FI_CURRENTWORD
{
-Pos = MAP_APPFONT ( 111 , 14 ) ;
+Pos = MAP_APPFONT ( 114 , 16 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedText FT_CURRENTCHARACTER
{
-Pos = MAP_APPFONT ( 12 , 26 ) ;
+Pos = MAP_APPFONT ( 10 , 28 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Characters:;
};
FixedText FI_CURRENTCHARACTER
{
-Pos = MAP_APPFONT ( 111 , 26 ) ;
+Pos = MAP_APPFONT ( 114 , 28 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedText FT_CURRENTCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 12 , 38 ) ;
+Pos = MAP_APPFONT ( 10 , 40 ) ;
Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = Characters excluding spaces:;
};
FixedText FI_CURRENTCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 111 , 38 ) ;
+Pos = MAP_APPFONT ( 114 , 40 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedLine FL_DOC
{
-Pos = MAP_APPFONT ( 6, 52 ) ;
-Size = MAP_APPFONT ( 158 , 8 ) ;
+Pos = MAP_APPFONT ( 5, 54 ) ;
+Size = MAP_APPFONT ( 160 , 8 ) ;
Text [ en-US ] = Whole document;
};
FixedText FT_DOCWORD
{
-Pos = MAP_APPFONT ( 12, 63 ) ;
+Pos = MAP_APPFONT ( 10, 65 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Words:;
};
FixedText FI_DOCWORD
{
-Pos = MAP_APPFONT ( 111 , 63 ) ;
+Pos = MAP_APPFONT ( 114 , 65 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Right = TRUE;
};
FixedText FT_DOCCHARACTER
{
-Pos = MAP_APPFONT ( 12 , 75 ) ;
+Pos = MAP_APPFONT ( 10 , 77 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = Characters:;
};
FixedText FI_DOCCHARACTER
{
-Pos = MAP_APPFONT ( 111, 75 ) ;
+Pos = MAP_APPFONT ( 114, 77 ) ;
Size = MAP_APPFONT ( 50, 8 ) ;
Right = TRUE;
};
FixedText FT_DOCCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 12 , 87 ) ;
+Pos = MAP_APPFONT ( 10 , 89 ) ;
Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = Characters excluding spaces:;
};
FixedText FI_DOCCHARACTEREXCLUDINGSPACES
{
-Pos = MAP_APPFONT ( 111, 87 ) ;
+Pos = MAP_APPFONT ( 114, 89 ) ;
Size = MAP_APPFONT ( 50, 8 ) ;
Right = TRUE;
};
FixedLine FL_BOTTOM
{
-Pos = MAP_APPFONT ( 6 , 101 ) ;
-Size = MAP_APPFONT ( 158 , 8 ) ;
+Pos = MAP_APPFONT ( 0 , 103 ) ;
+Size = MAP_APPFONT ( 170 , 8 ) ;
};
-OKButtonPB_OK
+HelpButton PB_HELP
{
-Pos = MAP_APPFONT ( 61 , 112 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-DefButton = TRUE ;
+Pos = MAP_APPFONT ( 5 , 114 ) ;
+Size = MAP_APPFONT ( 50 , 15 ) ;
};
-HelpButton PB_HELP
+OKButtonPB_OK
{
-Pos = MAP_APPFONT ( 114 , 112 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 115 , 114 ) ;
+Size = MAP_APPFONT ( 50 , 15 ) ;
+DefButton = TRUE ;
+Text [ en-US ] = ~Close;
};
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/util
instsetoo_native/util/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 19f0d48364d19bc02dcca92a324fbdbd6cb57535 Author: Andras Timar ati...@suse.com Date: Thu Dec 1 13:41:07 2011 +0100 delete the space after 'qtz', too otherwize double space will occur in the variable and it will be replaced to ',,' instead of ',' - build fails diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index db11ea4..16cc3a6 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -81,7 +81,7 @@ help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name helpcontent2 2 # do not build key is pseudolanguage for release builds .IF $(ENABLE_RELEASE_BUILD)==TRUE -alllangiso:=$(alllangiso:s/qtz//) +alllangiso:=$(alllangiso:s/qtz //) .ENDIF allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo_custom_images/crystal ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen ooo_custom_images/tango
ooo_custom_images/crystal/vcl/res/msgbox.png|binary ooo_custom_images/human/vcl/res/msgbox.png |binary ooo_custom_images/industrial/vcl/res/msgbox.png |binary ooo_custom_images/oxygen/vcl/res/msgbox.png |binary ooo_custom_images/tango/vcl/res/msgbox.png |binary 5 files changed New commits: commit a382228bc747d6a862287b06f31e5c2e4e0cd5a3 Author: Stefan Knorr (astron) heinzless...@gmail.com Date: Thu Dec 1 13:05:33 2011 +0100 Use themed icons for message boxes again diff --git a/ooo_custom_images/crystal/vcl/res/msgbox.png b/ooo_custom_images/crystal/vcl/res/msgbox.png new file mode 100644 index 000..e7397bc Binary files /dev/null and b/ooo_custom_images/crystal/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/human/vcl/res/msgbox.png b/ooo_custom_images/human/vcl/res/msgbox.png new file mode 100644 index 000..1012e98 Binary files /dev/null and b/ooo_custom_images/human/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/industrial/vcl/res/msgbox.png b/ooo_custom_images/industrial/vcl/res/msgbox.png new file mode 100644 index 000..2258cd4 Binary files /dev/null and b/ooo_custom_images/industrial/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/oxygen/vcl/res/msgbox.png b/ooo_custom_images/oxygen/vcl/res/msgbox.png new file mode 100644 index 000..e7397bc Binary files /dev/null and b/ooo_custom_images/oxygen/vcl/res/msgbox.png differ diff --git a/ooo_custom_images/tango/vcl/res/msgbox.png b/ooo_custom_images/tango/vcl/res/msgbox.png new file mode 100644 index 000..c47fd78 Binary files /dev/null and b/ooo_custom_images/tango/vcl/res/msgbox.png differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - distro-configs/LibreOfficeAndroid.conf README.Android
README.Android |4 +++- distro-configs/LibreOfficeAndroid.conf |3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 172b1f03bf23336c5aa88a01f74b24b6ef5ab4d2 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Dec 1 16:08:44 2011 +0200 Update diff --git a/README.Android b/README.Android index 540ac58..076dff2 100644 --- a/README.Android +++ b/README.Android @@ -44,6 +44,8 @@ library that corresponds to cppunittester program. Then through helper functions in liblo-bootstrap it calls a named function in that program. -This Android-specific code is for now in sal/osl/android. +This Android-specific native code (the lo-bootstrap library) is for +now in sal/android, and the Java code in the android module +(subdirectory right here). --Tor Lillqvist t...@iki.fi commit df938e85d68fc42a300319ce3ce77576b77367e5 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Dec 1 13:31:48 2011 +0200 Don't bother with Report Builder on Android for now diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 1583928..da6ede9 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -3,6 +3,7 @@ --disable-ext-pdfimport --disable-ext-presenter-console --disable-ext-presenter-minimizer +--disable-ext-report-builder --disable-gconf --disable-gnome-vfs --disable-gstreamer commit cfec328cc17a35cc70aeeb673aa8334f2d20f965 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Dec 1 13:24:45 2011 +0200 Don't bother with Presenter Console or Minimizer on Android for now diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index ce5a8dc..1583928 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -1,6 +1,8 @@ --host=arm-linux-androideabi --disable-cairo-canvas --disable-ext-pdfimport +--disable-ext-presenter-console +--disable-ext-presenter-minimizer --disable-gconf --disable-gnome-vfs --disable-gstreamer ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/lngmerge.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 60795da6a87f751e69eaf5f731c86d45a040a97e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 1 14:55:54 2011 +
fix broken .ulf translations
some loon ran a little amock (*cough*)
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index a641528..f07e13e 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -189,7 +189,7 @@ void LngParser::ReadLine( const ByteString sLine_in ,
ByteStringHashMap rText_
{
rtl::OString sLang = getToken(sLine_in, 0, '=');
sLang = comphelper::string::stripStart(sLang, ' ');
- sLang = comphelper::string::stripStart(sLang, ' ');
+ sLang = comphelper::string::stripEnd(sLang, ' ');
rtl::OString sText = getToken(getToken(sLine_in, 1, '\'), 0, '\');
if (!sLang.isEmpty())
rText_inout[ sLang ] = sText;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/filter/xml/xmlExport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ecbed27f6a2b61a6544c92178367eacfa2ea0b50
Author: August Sodora aug...@gmail.com
Date: Thu Dec 1 11:23:42 2011 -0500
Check length before operator[]
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx
b/dbaccess/source/filter/xml/xmlExport.cxx
index 50bf0b1..9da1a0e 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -565,7 +565,7 @@ void ODBExport::exportConnectionData()
{
::svt::OFileNotation aTransformer( sFileName );
::rtl::OUStringBuffer sURL( aTransformer.get(
::svt::OFileNotation::N_URL ) );
-if (sURL[sURL.getLength() - 1] != '/')
+if (sURL.getLength() == 0 || sURL[sURL.getLength() - 1] !=
'/')
sURL.append('/');
AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,GetRelativeReference(sURL.makeStringAndClear()));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuildfixes'
New branch 'feature/gbuildfixes' available with the following commits: commit ba894147056bdfe8766432bd60c45efec3702d54 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Dec 1 17:43:25 2011 +0100 use some macro magic here commit 9eabbd8f03353fb750194761bffa26204cde5133 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Dec 1 17:37:36 2011 +0100 some more work on staging buildpl in front of gbuild commit dca8b6c3d8a2e4ab2d823f3026dfe34de21376a9 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Dec 1 14:32:47 2011 +0100 introduce staged build ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - scp2/inc scp2/source solenv/bin
scp2/inc/macros.inc|7 scp2/source/activex/file_activex.scp |8 scp2/source/canvas/cairocanvas.scp |2 scp2/source/canvas/mtfrenderer.scp |2 scp2/source/crashrep/file_crashrep.scp |2 scp2/source/gnome/file_gnome.scp |8 scp2/source/impress/module_ogltrans.scp|2 scp2/source/javafilter/file_javafilter.scp |4 scp2/source/kde/file_kde.scp |4 scp2/source/ooo/file_library_ooo.scp | 250 ++--- scp2/source/ooo/ure.scp| 94 +++ scp2/source/python/file_python.scp |8 scp2/source/winexplorerext/file_winexplorerext.scp | 16 - solenv/bin/modules/installer/profiles.pm |2 14 files changed, 206 insertions(+), 203 deletions(-) New commits: commit 2578d13ea8bf7b3918e392a3fabca7ba2fec3146 Author: Petr Mladek pmla...@suse.cz Date: Wed Nov 30 16:48:22 2011 +0100 add exectuable rights for libraries on Linux RPM strips debuginfo packages from libraries only when they have execuateble rights It does not fix permissions of the prebuilt mozilla libraries; scp2 defines the same permissions for all files inside the mozruntime.zip archive. Unfortuantely, it icludes libraries and data files togetger. diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 8120b12..04e0179 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -90,6 +90,9 @@ #define BIN_FILE_BODY \ UnixRights = 755 +#define LIB_FILE_BODY \ +UnixRights = 755 + #define TXT_FILE_BODY \ UnixRights = 644 @@ -131,12 +134,12 @@ Styles = (ARCHIVE,SUBSTITUTE,PATCH) #define PACKED_LIB_FILE_BODY \ -TXT_FILE_BODY; \ +LIB_FILE_BODY; \ Styles = (PACKED); \ Dir= SCP2_OOO_BIN_DIR #define PACKED_LIB_FILE_BODY_PATCH \ -TXT_FILE_BODY; \ +LIB_FILE_BODY; \ Styles = (PACKED,PATCH); \ Dir= SCP2_OOO_BIN_DIR diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index db9b028..2ff8583 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -30,7 +30,7 @@ #ifdef WITH_ACTIVEX_COMPONENT File gid_File_Lib_Soactivex -TXT_FILE_BODY; +LIB_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = so_activex.dll; @@ -38,7 +38,7 @@ End #ifdef BUILD_X64 File gid_File_Lib_Soactivex64 - TXT_FILE_BODY; + LIB_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = so_activex_x64.dll; @@ -47,14 +47,14 @@ End #endif File gid_File_Lib_Regactivex_Msi -TXT_FILE_BODY; +LIB_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); Dir = SCP2_OOO_BIN_DIR; Name = regactivex.dll; End File gid_File_Lib_Regpatchactivex_Msi -TXT_FILE_BODY; +LIB_FILE_BODY; Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH); Dir = SCP2_OOO_BIN_DIR; Name = regpatchactivex.dll; diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp index 2d7af53..4b313bc 100644 --- a/scp2/source/canvas/cairocanvas.scp +++ b/scp2/source/canvas/cairocanvas.scp @@ -28,7 +28,7 @@ #include macros.inc File gid_File_Lib_CairoCanvas -TXT_FILE_BODY; +LIB_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp index 7e239be..da372b2 100644 --- a/scp2/source/canvas/mtfrenderer.scp +++ b/scp2/source/canvas/mtfrenderer.scp @@ -28,7 +28,7 @@ #include macros.inc File gid_File_Lib_MtfRenderer -TXT_FILE_BODY; +LIB_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp index 53ec1ac..481d9fc 100644 --- a/scp2/source/crashrep/file_crashrep.scp +++ b/scp2/source/crashrep/file_crashrep.scp @@ -55,7 +55,7 @@ End #ifdef WNT File gid_Brand_File_Lib_Dbghelp -TXT_FILE_BODY; +LIB_FILE_BODY; Name = dbghelp.dll; Dir = gid_Brand_Dir_Program; Styles = (PACKED); diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index e3d2baf..27968b5 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -28,7 +28,7 @@ #ifdef ENABLE_GIO File gid_File_Lib_GIO -TXT_FILE_BODY; +LIB_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); @@ -37,7 +37,7 @@ End #ifdef ENABLE_GNOMEVFS File gid_File_Lib_Gnomevfs -TXT_FILE_BODY; +LIB_FILE_BODY; Styles =
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
binfilter/bf_sc/source/core/data/sc_attrib.cxx |2 +-
binfilter/bf_sc/source/core/data/sc_global2.cxx |2 +-
binfilter/bf_sc/source/core/data/sc_stlpool.cxx |2 +-
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx|5 +
binfilter/bf_sc/source/core/tool/sc_editutil.cxx|3 +++
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx|6 +++---
binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx |4 ++--
binfilter/bf_sc/source/ui/view/sc_printfun.cxx |2 +-
binfilter/bf_sfx2/source/appl/appimp.hxx|2 ++
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx |2 +-
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx|6 +-
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx |2 +-
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx |2 +-
binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx|2 +-
binfilter/bf_sfx2/source/doc/timestamp.cxx |4 ++--
binfilter/bf_sfx2/source/inc/objshimp.hxx |2 +-
binfilter/bf_so3/source/persist/persist.cxx |3 ++-
binfilter/bf_svtools/source/items1/svt_dateitem.cxx |2 +-
binfilter/bf_svtools/source/items1/svt_dtritem.cxx |2 +-
binfilter/bf_svtools/source/items1/svt_frqitem.cxx |6 --
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx|4 ++--
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx|2 +-
binfilter/bf_svx/source/items/svx_flditem.cxx |4 ++--
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx |8 ++--
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx |1 +
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx |1 +
binfilter/bf_sw/source/core/doc/sw_docnum.cxx |4 ++--
binfilter/bf_sw/source/core/fields/sw_flddat.cxx|8
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx |6 +++---
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |4 ++--
binfilter/bf_sw/source/core/swg/sw_rdflds.cxx |4 ++--
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx |3 ++-
binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx |9
++---
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx |2 +-
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx |2 +-
binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx |4 ++--
binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx |2 +-
binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx |4 ++--
binfilter/inc/bf_sc/chgviset.hxx|4
39 files changed, 84 insertions(+), 53 deletions(-)
New commits:
commit 3a6e9e2dd7fb6c0e71eed13d4f70b05b9f832ace
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 1 19:07:16 2011 +0100
get rid of class Date and Time default ctor with system time penalty
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index d1cf0f1..a88fbd0 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -689,7 +689,7 @@ using namespace ::com::sun::star;
/*N*/ while ((nPos = aStr.Search(pCommands[2])) != STRING_NOTFOUND)
/*N*/ {
/*N*/ ESelection aSel( nPar,nPos, nPar,nPos+pCommands[2].Len() );
-/*N*/ rEng.QuickInsertField(
SvxFieldItem(SvxDateField(Date(),SVXDATETYPE_VAR)), aSel );
+/*N*/ rEng.QuickInsertField( SvxFieldItem(SvxDateField(Date(
Date::SYSTEM),SVXDATETYPE_VAR)), aSel );
/*N*/ lcl_SetSpace(aStr, aSel ); bChange = TRUE;
/*N*/ }
/*N*/ while ((nPos = aStr.Search(pCommands[3])) != STRING_NOTFOUND)
diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx
b/binfilter/bf_sc/source/core/data/sc_global2.cxx
index a186de3..5ebe7a0 100644
--- a/binfilter/bf_sc/source/core/data/sc_global2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx
@@ -824,7 +824,7 @@ namespace binfilter {
/*N*/ void ScPostIt::AutoSetText( const String rNewText )
/*N*/ {
/*N*/ aStrText = rNewText;
-/*N*/ aStrDate = ScGlobal::pLocaleData-getDate( Date() );
+/*N*/ aStrDate = ScGlobal::pLocaleData-getDate( Date( Date::SYSTEM ) );
/*N*/
/*N*/ SvtUserOptions aUserOpt;
/*N*/ aStrAuthor = aUserOpt.GetID();
diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index 4040eb9..2f13acc 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -378,7 +378,7 @@ namespace binfilter {
/*N*/
[Libreoffice-commits] .: instsetoo_native/util postprocess/prj scp2/prj scp2/source scp2/util setup_native/source smoketestoo_native/losmoketest smoketestoo_native/makefile.mk smoketestoo_native/prj s
instsetoo_native/util/makefile.mk | 34 +++-
instsetoo_native/util/openoffice.lst| 98 +++
instsetoo_native/util/pack.lst |1
postprocess/prj/build.lst |2
scp2/prj/build.lst |3
scp2/prj/d.lst |2
scp2/source/smoketest/makefile.mk | 42
scp2/source/smoketest/module_smoketest.scp | 50 +
scp2/source/smoketest/module_smoketest.ulf | 35
scp2/source/smoketest/smoketest.scp | 204
scp2/util/makefile.mk |7
setup_native/source/packinfo/packinfo_test.txt | 44 +
smoketestoo_native/losmoketest | 61 +++
smoketestoo_native/makefile.mk |4
smoketestoo_native/prj/build.lst|2
smoketestoo_native/prj/d.lst|3
solenv/bin/modules/installer/download.pm|4
solenv/gbuild/extensions/post_BuildplTargets.mk |3
18 files changed, 591 insertions(+), 8 deletions(-)
New commits:
commit 8c478c911033243df90ba290b32732a1fd70130e
Author: Petr Mladek pmla...@suse.cz
Date: Fri Nov 25 19:30:08 2011 +0100
create installation set for tests
+ it currently includes just the smoketest and is available only for Linux
+ the side effect is that it builds the smoketest before instsetoo_native
+ it runs it only during dev-install when the variable RUN_SMOKETEST == YES
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 16cc3a6..39677d2 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -104,7 +104,7 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
$(eq,$(OS),MACOSX $(NULL)
.IF $(GUI)==WNT
ALLTAR : openofficeall ooohelppack sdkooall
.ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX
$(NULL) ooohelppack) sdkoo_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX
$(NULL) ooohelppack) sdkoo_en-US $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
.ENDIF
.ENDIF
.ELSE # $(ENABLE_RELEASE_BUILD)==TRUE
@@ -118,7 +118,7 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack
$(eq,$(OS),MACOSX $(
.IF $(GUI)==WNT
ALLTAR : openofficedevall ooodevhelppack sdkoodevall
.ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX
$(NULL) ooodevhelppack) sdkoodev_en-US
+ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX
$(NULL) ooodevhelppack) sdkoodev_en-US $(eq,$(OS),MACOSX $(NULL)
lodevtest_en-US)
.ENDIF
.ENDIF
.ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE
@@ -167,6 +167,10 @@ sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
+lotest: $(foreach,i,$(alllangiso) lotest_$i)
+
+lodevtest: $(foreach,i,$(alllangiso) lodevtest_$i)
+
ure: $(foreach,i,$(alllangiso) ure_$i)
oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
@@ -182,6 +186,7 @@
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
+MSITESTTEMPLATESOURCE=$(PRJ)$/inc_lotest$/windows$/msi_templates
MSICOMMONTEMPLATESOURCE=$(PRJ)$/inc_common$/windows$/msi_templates
NOLOGOSPLASH:=$(BIN)$/intro.zip
@@ -191,6 +196,7 @@ MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
MSIHELPPACKTEMPLATEDIR=$(MISC)$/ooohelppack$/msi_templates
MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
+MSITESTTEMPLATEDIR=$(MISC)$/lotest$/msi_templates
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
.IF $(OS) == WNT
@@ -216,6 +222,10 @@ $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
+$(foreach,i,$(alllangiso) lotest_$i) : $(ADDDEPS)
+
+$(foreach,i,$(alllangiso) lodevtest_$i) : $(ADDDEPS)
+
$(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS)
$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
@@ -274,6 +284,15 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) :
$$@{$(PKGFORMAT:^.)}
sdkoodev_%{$(PKGFORMAT:^.)} :
$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip
-format $(@:e:s/.//) $(VERBOSESWITCH)
+$(foreach,i,$(alllangiso) lotest_$i) : $$@{$(PKGFORMAT:^.)}
+lotest_%{$(PKGFORMAT:^.)} :
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
LibreOffice_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR)
-msilanguage $(COMMONMISC)$/win_ulffiles
[Libreoffice-commits] .: 2 commits - instsetoo_native/util solenv/bin
instsetoo_native/util/openoffice.lst |6 --
solenv/bin/make_installer.pl | 10 +++---
solenv/bin/modules/installer/control.pm | 10 +-
solenv/bin/modules/installer/globals.pm |1 -
solenv/bin/modules/installer/windows/msiglobal.pm |3 ---
solenv/bin/modules/installer/ziplist.pm | 20 +++-
6 files changed, 11 insertions(+), 39 deletions(-)
New commits:
commit f799339a4ccf1d6e35976e9e185c94c1d68c3d5b
Author: Andras Timar ati...@suse.com
Date: Thu Dec 1 21:16:31 2011 +0100
set manufacturer name to OOO_VENDOR or else to USERNAME
diff --git a/solenv/bin/modules/installer/ziplist.pm
b/solenv/bin/modules/installer/ziplist.pm
index bef3182..cbbe663 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -632,12 +632,19 @@ sub list_all_files_from_include_path
sub set_manufacturer
{
my ($allvariables) = @_;
+my $manufacturer;
-my $openofficeproductname = LibreOffice;
-my $sunname = ;
+if ( $ENV{'OOO_VENDOR'} ne )
+{
+$manufacturer = $ENV{'OOO_VENDOR'};
+}
+else
+{
+$manufacturer = $ENV{'USERNAME'};
+}
-$installer::globals::manufacturer = $openofficeproductname;
-$installer::globals::longmanufacturer = $openofficeproductname;
+$installer::globals::manufacturer = $manufacturer;
+$installer::globals::longmanufacturer = $manufacturer;
$allvariables-{'MANUFACTURER'} = $installer::globals::manufacturer;
}
commit be8a7eb7c1cfcb9d89898c6cf40f560577a0c0a8
Author: Andras Timar ati...@suse.com
Date: Thu Dec 1 21:11:03 2011 +0100
our product is always opensource
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 68423c9..1313851 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -39,7 +39,6 @@ Globals
OOODOWNLOADNAME 1
STARTCENTER_LAYOUT_STYLE 0
BUILDIDCWS {buildidcws}
-OPENSOURCE 1
}
}
}
@@ -75,7 +74,6 @@ LibreOffice
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 0
@@ -136,7 +134,6 @@ LibreOffice_wJRE
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 1
@@ -200,7 +197,6 @@ LibreOffice_Dev
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 0
@@ -501,7 +497,6 @@ OxygenOffice
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 0
@@ -567,7 +562,6 @@ OxygenOffice_wJRE
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 1
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index ae4b751..5ebd70f 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -641,9 +641,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
$installer::globals::addsystemintegration = 0;
$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
-
-if ( $allvariableshashref-{'OPENSOURCE'} ) {
$installer::globals::makedownload = 1; }
-else { $installer::globals::makedownload = 0; }
+$installer::globals::makedownload = 1;
}
if ( $installer::globals::helppack )
@@ -652,9 +650,7 @@ for ( my $n = 0; $n =
$#installer::globals::languageproducts; $n++ )
$installer::globals::addsystemintegration = 0;
$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
-
-if (
[Libreoffice-commits] .: 2 commits - cppu/source
cppu/source/threadpool/threadident.cxx |7 +--
cppu/source/typelib/static_types.cxx |2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit beebf578ed20771495d2eda9e7fb898767f49d7c
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 1 21:24:01 2011 +0100
-Wstrict-aliasing fix
diff --git a/cppu/source/threadpool/threadident.cxx
b/cppu/source/threadpool/threadident.cxx
index b218c20..a4e76c4 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -51,8 +51,11 @@ using namespace ::cppu;
static inline void createLocalId( sal_Sequence **ppThreadId )
{
rtl_byte_sequence_constructNoDefault( ppThreadId , 4 + 16 );
-*((sal_Int32*) ((*ppThreadId)-elements)) = osl_getThreadIdentifier(0);
-
+sal_uInt32 id = osl_getThreadIdentifier(0);
+(*ppThreadId)-elements[0] = id 0xFF;
+(*ppThreadId)-elements[1] = (id 8) 0xFF;
+(*ppThreadId)-elements[2] = (id 16) 0xFF;
+(*ppThreadId)-elements[3] = (id 24) 0xFF;
rtl_getGlobalProcessId( (sal_uInt8 * ) ( (*ppThreadId)-elements[4]) );
}
commit db4017cb710b254ccc4e1980fdf419134afab252
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 1 21:22:34 2011 +0100
The other uses of pReserved had been changed to nStaticRefCount in 2001.
diff --git a/cppu/source/typelib/static_types.cxx
b/cppu/source/typelib/static_types.cxx
index 0727faf..32e4684 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -578,7 +578,7 @@ void SAL_CALL typelib_static_enum_type_init(
OSL_ASSERT( *ppRef == pReg-pWeakRef );
}
// another static ref:
-++(*(sal_Int32 *)(*ppRef)-pReserved);
+++((*ppRef)-nStaticRefCount);
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source lingucomponent/source sal/inc sal/qa
connectivity/source/parse/sqlbison.y | 10
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 12
sal/inc/rtl/strbuf.hxx | 36 -
sal/inc/rtl/ustrbuf.hxx | 36 -
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 321 ---
sal/qa/rtl_strings/rtl_OUStringBuffer.cxx| 172 -
6 files changed, 11 insertions(+), 576 deletions(-)
New commits:
commit 9ee19c8fad2c3c29c4ff4cc6c37ba8d24d641ccc
Author: August Sodora aug...@gmail.com
Date: Thu Dec 1 16:21:54 2011 -0500
fdo#41474: remove setCharAt and charAt from O[U]StringBuffer
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 062b46c..19bb494 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4529,15 +4529,15 @@ const double fMilliSecondsPerDay = 8640.0;
for (sal_Int32 i = 0; i nLen; i++)
{
- const sal_Unicode c = aMatchStr.charAt(i);
- if (c == sSearch.charAt(0) || c == sSearch.charAt(1))
+ const sal_Unicode c = aMatchStr[i];
+ if (c == sSearch[0] || c == sSearch[1])
{
- if (i 0 aMatchStr.charAt(i-1) == cEscape)
+ if (i 0 aMatchStr[i - 1] == cEscape)
continue;
else
{
- const sal_Unicode cCharacter =
sReplace.charAt( (c == sSearch.charAt(0)) ? 0 : 1);
- aMatchStr.setCharAt(i , cCharacter);
+ const sal_Unicode cCharacter =
sReplace[(c == sSearch[0] ? 0 : 1)];
+ aMatchStr[i] = cCharacter;
}
}
}
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index 92aecc5..5baf4d4 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -248,9 +248,9 @@ sal_Int16 MacSpellChecker::GetSpellFailure( const OUString
rWord, const Locale
sal_Int32 n = rBuf.getLength();
sal_Unicode c;
for (sal_Int32 ix=0; ix n; ix++) {
-c = rBuf.charAt(ix);
-if ((c == 0x201C) || (c == 0x201D))
rBuf.setCharAt(ix,(sal_Unicode)0x0022);
-if ((c == 0x2018) || (c == 0x2019))
rBuf.setCharAt(ix,(sal_Unicode)0x0027);
+c = rBuf[ix];
+if ((c == 0x201C) || (c == 0x201D)) rBuf[ix] = (sal_Unicode)0x0022;
+if ((c == 0x2018) || (c == 0x2019)) rBuf[ix] = (sal_Unicode)0x0027;
}
OUString nWord(rBuf.makeStringAndClear());
@@ -356,9 +356,9 @@ Reference XSpellAlternatives
sal_Int32 n = rBuf.getLength();
sal_Unicode c;
for (sal_Int32 ix=0; ix n; ix++) {
- c = rBuf.charAt(ix);
- if ((c == 0x201C) || (c == 0x201D))
rBuf.setCharAt(ix,(sal_Unicode)0x0022);
- if ((c == 0x2018) || (c == 0x2019))
rBuf.setCharAt(ix,(sal_Unicode)0x0027);
+ c = rBuf[ix];
+ if ((c == 0x201C) || (c == 0x201D)) rBuf[ix] = (sal_Unicode)0x0022;
+ if ((c == 0x2018) || (c == 0x2019)) rBuf[ix] = (sal_Unicode)0x0027;
}
OUString nWord(rBuf.makeStringAndClear());
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 5f0b9b3..e3ae74b 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -269,25 +269,6 @@ public:
}
/**
-Returns the character at a specific index in this string buffer.
-
-The first character of a string buffer is at index
-code0/code, the next at index code1/code, and so on, for
-array indexing.
-p
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the desired character.
-@return the character at the specified index of this string buffer.
- */
-sal_Char charAt( sal_Int32 index )
-{
-assert(index = 0 index pData-length);
-return pData-buffer[ index ];
-}
-
-/**
Return a null terminated character array.
*/
const sal_Char* getStr() const { return pData-buffer; }
@@ -313,23 +294,6 @@ public:
}
/**
-The character at the specified index of this string buffer is set
-to codech/code.
-
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the character to modify.
-
[Libreoffice-commits] .: autodoc/source basegfx/inc bean/com bin/lo-pack-sources canvas/inc canvas/source comphelper/inc configure.in cosv/inc cppcanvas/source desktop/source drawinglayer/source filte
autodoc/source/ary/idl/it_xnameroom.hxx |2 -
basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx |2 -
basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx|2 -
bean/com/sun/star/comp/beans/OOoBean.java |6 +--
bin/lo-pack-sources |2 -
canvas/inc/canvas/base/canvascustomspritebase.hxx |2 -
canvas/source/cairo/cairo_canvas.hxx|2 -
canvas/source/cairo/cairo_canvascustomsprite.hxx|2 -
canvas/source/cairo/cairo_spritecanvas.hxx |2 -
canvas/source/directx/dx_canvascustomsprite.hxx |2 -
canvas/source/directx/dx_canvashelper_texturefill.cxx |2 -
canvas/source/directx/dx_spritecanvas.hxx |2 -
canvas/source/null/null_canvascustomsprite.hxx |2 -
canvas/source/null/null_spritecanvas.hxx|2 -
canvas/source/tools/canvascustomspritehelper.cxx|2 -
canvas/source/vcl/canvascustomsprite.hxx|2 -
canvas/source/vcl/canvashelper_texturefill.cxx |6 +--
canvas/source/vcl/spritecanvas.hxx |2 -
comphelper/inc/comphelper/implementationreference.hxx |2 -
configure.in|2 -
cosv/inc/cosv/tpl/dyn.hxx |2 -
cppcanvas/source/mtfrenderer/implrenderer.cxx | 18
+-
desktop/source/deployment/registry/inc/dp_backend.h |2 -
drawinglayer/source/primitive2d/textlayoutdevice.cxx|2 -
drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx|2 -
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 -
filter/source/graphicfilter/eps/eps.cxx |2 -
o3tl/qa/cow_wrapper_clients.hxx |2 -
sd/source/core/CustomAnimationEffect.cxx|4 +-
slideshow/source/engine/activitiesqueue.cxx |4 +-
slideshow/source/engine/animationfactory.cxx|2 -
slideshow/source/engine/animationnodes/animationnodefactory.cxx |2 -
slideshow/source/engine/eventmultiplexer.cxx|2 -
slideshow/source/engine/eventqueue.cxx |4 +-
slideshow/source/engine/shapes/drawshapesubsetting.cxx |2 -
slideshow/source/engine/slide/layermanager.cxx |2 -
slideshow/source/engine/slide/layermanager.hxx |2 -
slideshow/source/engine/slide/slideanimations.hxx |2 -
slideshow/source/engine/transitions/shapetransitionfactory.cxx |2 -
slideshow/source/engine/transitions/slidechangebase.cxx |2 -
slideshow/source/inc/attributableshape.hxx | 10 ++---
slideshow/source/inc/slide.hxx |2 -
solenv/bin/modules/installer/windows/feature.pm |2 -
svtools/source/filter/jpeg/jpeg.cxx |2 -
sw/source/core/layout/calcmove.cxx |2 -
sw/source/core/txtnode/thints.cxx |2 -
sw/source/ui/docvw/edtwin.cxx |2 -
sw/source/ui/frmdlg/frmmgr.cxx |2 -
ucb/source/ucp/package/pkgcontent.cxx |2 -
vcl/source/gdi/gdimtf.cxx |4 +-
vcl/source/gdi/outdev2.cxx |2 -
vcl/source/gdi/outdev6.cxx |2 -
vcl/source/gdi/regband.cxx |2 -
xmloff/source/chart/SchXMLSeries2Context.cxx|2 -
54 files changed, 74 insertions(+), 74 deletions(-)
New commits:
commit e10fc18fb2c74ac3e432ffaa2b1c125110fe2eeb
Author: Lior Kaplan kaplanl...@gmail.com
Date: Thu Dec 1 23:41:42 2011 +0200
typo fix: explicitely - explicitly
diff --git a/autodoc/source/ary/idl/it_xnameroom.hxx
b/autodoc/source/ary/idl/it_xnameroom.hxx
index cb70e17..de45248 100644
--- a/autodoc/source/ary/idl/it_xnameroom.hxx
+++ b/autodoc/source/ary/idl/it_xnameroom.hxx
@@ -42,7 +42,7 @@ namespace idl
{
-/** A namespace for -Type s, as they are explicitely written in code.
+/** A namespace for -Type s, as they are explicitly written in code.
The search/identification string is usually the local name of
the Type. But for templated structs, the search string has this
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
index af188cb..0c6296d 100644
---
[Libreoffice-commits] .: sal/qa
sal/qa/rtl_strings/rtl_String_Const.h |5 - 1 file changed, 5 deletions(-) New commits: commit c351b1e19f1b1207949b70386640dc06ef0144ad Author: August Sodora aug...@gmail.com Date: Thu Dec 1 16:41:45 2011 -0500 WaE: unused variables diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h index 2b14b46..2c2e4b7 100644 --- a/sal/qa/rtl_strings/rtl_String_Const.h +++ b/sal/qa/rtl_strings/rtl_String_Const.h @@ -59,7 +59,6 @@ static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVT static const sal_Char *kTestStr1 = Sun Microsystems; static const sal_Char *kTestStr2 = Sun Microsystems Java Technology; -static const sal_Char *kTestStr3 = Sun microsystems; static const sal_Char *kTestStr4 = SUN MICROSYSTEMS; static const sal_Char *kTestStr5 = sun microsystems; static const sal_Char *kTestStr6 = Java Technology; @@ -88,10 +87,6 @@ static const sal_Char *kTestStr28 = \50\3\5\7\11\13\15\17sun; static const sal_Char *kTestStr29 = \50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50; static const sal_Char *kTestStr30 = sun\21\23\25\27\31\33\50; static const sal_Char *kTestStr31 = sun Microsystems; -static const sal_Char *kTestStr32 = Sun Microsystem ; -static const sal_Char *kTestStr33 = ; -static const sal_Char *kTestStr34 = \50\5\5\7\11\13\15\17sun; -static const sal_Char *kTestStr35 = \50\373\5\7\11\13\15\17sun; static const sal_Char *kTestStr36 = Microsystems Java Technology; static const sal_Char *kTestStr37 = Sun Java Technology; static const sal_Char *kTestStr38 = \21\23\25\27\31\33\50; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in connectivity/prj connectivity/source postgresql/makefile.mk postgresql/prj
configure.in | 44 +++
connectivity/prj/build.lst |2
connectivity/source/drivers/postgresql/makefile.mk |7 +
postgresql/makefile.mk | 81 +
postgresql/prj/build.lst |3
postgresql/prj/d.lst |7 +
6 files changed, 127 insertions(+), 17 deletions(-)
New commits:
commit 44ec239eba3b652fc8dbe1e0eb66c7f9ed018137
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Dec 1 21:59:09 2011 +0100
Internal libpq (PostgreSQL client lib)
diff --git a/configure.in b/configure.in
index 796c5f1..890ec7b 100644
--- a/configure.in
+++ b/configure.in
@@ -5403,7 +5403,7 @@ dnl
===
if test x$enable_ext_postgresql_sdbc = xyes -a
x$enable_extension_integration != xno; then
SCPDEFS=$SCPDEFS -DWITH_EXTENSION_POSTGRESQL
-AC_MSG_CHECKING([for PostgreSQL prerequisites])
+AC_MSG_CHECKING([PostgreSQL C interface])
if test $with_system_postgresql = yes; then
AC_MSG_RESULT([external PostgreSQL])
SYSTEM_POSTGRESQL=YES
@@ -5420,27 +5420,33 @@ if test x$enable_ext_postgresql_sdbc = xyes -a
x$enable_extension_integrati
POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
POSTGRESQL_LIB=-L$(${PGCONFIG} --libdir)
else
-SYSTEM_POSTGRESQL=NO
if test -n $with_libpq_path; then
+SYSTEM_POSTGRESQL=YES
AC_MSG_RESULT([external libpq])
POSTGRESQL_LIB=-L${with_libpq_path}/lib/
POSTGRESQL_INC=-I${with_libpq_path}/include/
else
-AC_MSG_ERROR([not given. Please specify either
--with-system-postgresql or --with-libpq-path])
+SYSTEM_POSTGRESQL=NO
+AC_MSG_RESULT([internal])
+POSTGRESQL_LIB=
+POSTGRESQL_INC=@@OVERRIDE_ME@@
+BUILD_TYPE=$BUILD_TYPE POSTGRESQL
fi
fi
-AC_MSG_CHECKING([for PostgreSQL C interface])
-save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-CPPFLAGS=${CPPFLAGS} ${POSTGRESQL_INC}
-LIBS=${LIBS} ${POSTGRESQL_LIB}
-AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])],
[])
-AC_CHECK_LIB(pq, PQconnectdbParams, [],
-[AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], [])
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+if test ${SYSTEM_POSTGRESQL} = YES; then
+AC_MSG_NOTICE([checking system PostgreSQL prerequisites])
+save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LIBS=$LIBS
+CPPFLAGS=${CPPFLAGS} ${POSTGRESQL_INC}
+LIBS=${LIBS} ${POSTGRESQL_LIB}
+AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is
needed])], [])
+AC_CHECK_LIB(pq, PQconnectdbParams, [],
+[AC_MSG_ERROR(libpq not found or too old. Need = 9.0)], [])
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LIBS=$save_LIBS
+fi
BUILD_POSTGRESQL_SDBC=YES
fi
AC_SUBST(BUILD_POSTGRESQL_SDBC)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index dae3499..fd358fa 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz
svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg
NSS:nss LIBXSLT:libxslt NULL
+cn connectivity:shell TRANSLATIONS:translations comphelper MOZ:moz
POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb
qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
cn connectivityusr1- all cn_mkout
NULL
cn connectivity\incnmake - all cn_inc NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all
cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/source/drivers/postgresql/makefile.mk
b/connectivity/source/drivers/postgresql/makefile.mk
index e498981..615b26b 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -101,11 +101,18 @@ SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
# LEM 17/11/2011: removed everything except libpq proper;
# as per instructions in libpq documentation.
# If it turns out the rest was needed, reenable it.
+.IF $(SYSTEM_POSTGRESQL)==YES
.IF $(GUI)==WNT
LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
.ELSE
LIBPQ_LINK=-lpq #-lcrypt
.ENDIF
+.ELSE #SYSTEM_POSTGRESQL==NO
+LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
+POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
+POSTGRESQL_LIB=
+.ENDIF
+
SHL2TARGET=postgresql-sdbc-impl.uno
LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
LIB2OBJFILES= \
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
new file mode 100644
index 000..d75b0de
---
[Libreoffice-commits] .: sax/qa sax/source
sax/qa/cppunit/test_converter.cxx |8 +++-
sax/source/tools/converter.cxx|7 +--
2 files changed, 4 insertions(+), 11 deletions(-)
New commits:
commit a97a5310f921a483d0d11a98cd18185890bcccbc
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 1 23:00:07 2011 +0100
we are W3C XMLSchema here, not ISO 8601
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 17d1303..64bbf29 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -215,13 +215,11 @@ void ConverterTest::testDateTime()
doTest( util::DateTime(0, 0, 0, 24, 1, 1, 333)
/*(0, 0, 0, 0, 2, 1, 333)*/,
0333-01-01T24:00:00/*, 0333-01-02T00:00:00*/ );
-// A leading ^+ is NOT invalid, ISO 8601 specifies this for explicit AD/CE.
-doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
-+0001-01-01T00:00:00, 0001-01-01T00:00:00 );
-// While ISO 8601 specifies a minimum of 4 year digits we are lenient in
-// what we accept.
+// While W3C XMLSchema specifies a minimum of 4 year digits we are lenient
+// in what we accept.
doTest( util::DateTime(0, 0, 0, 0, 1, 1, 1),
1-01-01T00:00:00, 0001-01-01T00:00:00 );
+doTestDateTimeF( +0001-01-01T00:00:00 ); // invalid: ^+
doTestDateTimeF( 0001-1-01T00:00:00 ); // invalid: 2 M
doTestDateTimeF( 0001-01-1T00:00:00 ); // invalid: 2 D
doTestDateTimeF( 0001-01-01T0:00:00 ); // invalid: 2 H
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 0c0779b..f2dea8a 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1352,16 +1352,11 @@ bool Converter::convertDateOrDateTime(
//Negative Number
++nPos;
}
-else if (sal_Unicode('+') == string[nPos])
-{
-//Positive Number, explicit AD/CE
-++nPos;
-}
}
sal_Int32 nYear(0);
{
-// While ISO 8601 specifies years with a minimum of 4 digits, be
+// While W3C XMLSchema specifies years with a minimum of 4 digits, be
// leninent in what we accept for years 1000. One digit is acceptable
// if the remainders match.
bSuccess = readDateTimeComponent(string, nPos, nYear, 1, false);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 9 commits - sc/inc sc/qa sc/source
sc/inc/cell.hxx|2 -
sc/inc/formularesult.hxx |4 +-
sc/inc/globstr.hrc |5 ++
sc/qa/unit/filters-test.cxx| 60 -
sc/qa/unit/subsequent_filters-test.cxx | 18 -
sc/source/ui/inc/namedefdlg.hrc|3 -
sc/source/ui/inc/namedefdlg.hxx| 21 +--
sc/source/ui/inc/namedlg.hrc |6 ---
sc/source/ui/inc/namedlg.hxx | 29 +++
sc/source/ui/inc/namepast.hxx |4 +-
sc/source/ui/namedlg/namedefdlg.cxx| 22 +---
sc/source/ui/namedlg/namedlg.cxx | 36 +++
sc/source/ui/namedlg/namemgrtable.cxx |2 +
sc/source/ui/namedlg/namepast.cxx |4 +-
sc/source/ui/src/globstr.src |8
sc/source/ui/src/namedefdlg.src| 16
sc/source/ui/src/namedlg.src | 29 +--
17 files changed, 79 insertions(+), 190 deletions(-)
New commits:
commit c00d6519e919275b390b82b1d1a49a31fe519993
Author: Laurent Godard lgodard.li...@laposte.net
Date: Thu Dec 1 15:06:25 2011 +0100
String to OUString for SetHybridString method
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 58a16b8..fa1b719 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -518,7 +518,7 @@ public:
If for whatever reason you have to use both, SetHybridDouble() and
SetHybridString() or SetHybridFormula(), use SetHybridDouble() first
for performance reasons.*/
-voidSetHybridString( const String r )
+voidSetHybridString( const rtl::OUString r )
{ aResult.SetHybridString( r); }
/** For import only: set a temporary formula string to be compiled later.
If for whatever reason you have to use both, SetHybridDouble() and
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 1cc5faf..2aa674c 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -200,7 +200,7 @@ public:
/** Should only be used by import filters, best in the order
SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only
SetHybridFormula() for formula string to be compiled later. */
-inline voidSetHybridString( const String rStr );
+inline voidSetHybridString( const rtl::OUString rStr );
/** Should only be used by import filters, best in the order
SetHybridDouble(), SetHybridString()/SetHybridFormula(), or only
@@ -572,7 +572,7 @@ inline void ScFormulaResult::SetHybridDouble( double f )
}
-inline void ScFormulaResult::SetHybridString( const String rStr )
+inline void ScFormulaResult::SetHybridString( const rtl::OUString rStr )
{
// Obtain values before changing anything.
double f = GetDouble();
commit 8e83722d93bfc49c3a5c31d55ff728842209765a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Dec 1 23:02:24 2011 +0100
ManageNames: remove Select button from Manage Names
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index 01ea06c..56a2dbe 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -33,7 +33,6 @@
#define BTN_DELETE 57
#define BTN_NAME_OK 62
#define BTN_NAME_CANCEL 73
-#define BTN_SELECT 74
#define FT_SCOPE7
#define FT_RANGE58
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 5fc6fa8..90252c5 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -68,7 +68,6 @@ private:
PushButton maBtnAdd;
PushButton maBtnDelete;
-PushButton maBtnSelect;
HelpButton maBtnHelp;
PushButton maBtnOk;
PushButton maBtnCancel;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index e5b8440..19eb169 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -85,7 +85,6 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent,
//
maBtnAdd ( this, ScResId( BTN_ADD ) ),
maBtnDelete ( this, ScResId( BTN_DELETE ) ),
-maBtnSelect ( this, ScResId( BTN_SELECT ) ),
maBtnHelp( this, ScResId( BTN_HELP ) ),
maBtnOk ( this, ScResId( BTN_NAME_OK ) ),
maBtnCancel ( this, ScResId( BTN_NAME_CANCEL ) ),
@@ -180,8 +179,6 @@ void ScNameDlg::Init()
//TODO: fix the Add Button
maBtnAdd.Disable();
-//TODO: discuss the Select Range button with UX
-maBtnSelect.Disable();
}
sal_Bool ScNameDlg::IsRefInputMode() const
@@ -442,7 +439,6 @@ void ScNameDlg::SelectionChanged()
maEdAssign.Disable();
aRbAssign.Disable();
maLbScope.Disable();
-maBtnSelect.Disable();
maBtnRowHeader.Disable();
maBtnColHeader.Disable();
maBtnPrintArea.Disable();
@@ -461,7 +457,6 @@
[Libreoffice-commits] .: sal/qa
sal/qa/OStringBuffer/rtl_String_Const.h |5 - 1 file changed, 5 deletions(-) New commits: commit 36fa8503a101ca6dda5ed9cddf7b99704f96cc6a Author: Andras Timar ati...@suse.com Date: Thu Dec 1 23:15:19 2011 +0100 remove unused string constants diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index 7841e4f..a700905 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -59,7 +59,6 @@ static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVT static const sal_Char *kTestStr1 = Sun Microsystems; static const sal_Char *kTestStr2 = Sun Microsystems Java Technology; -static const sal_Char *kTestStr3 = Sun microsystems; static const sal_Char *kTestStr7 = Sun ; static const sal_Char *kTestStr8 = Microsystems; static const sal_Char *kTestStr14 =Sun Microsystems; @@ -70,10 +69,6 @@ static const sal_Char *kTestStr27 = s; static const sal_Char *kTestStr28 = \50\3\5\7\11\13\15\17sun; static const sal_Char *kTestStr29 = \50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50; static const sal_Char *kTestStr31 = sun Microsystems; -static const sal_Char *kTestStr32 = Sun Microsystem ; -static const sal_Char *kTestStr33 = ; -static const sal_Char *kTestStr34 = \50\5\5\7\11\13\15\17sun; -static const sal_Char *kTestStr35 = \50\373\5\7\11\13\15\17sun; static const sal_Char *kTestStr36 = Microsystems Java Technology; static const sal_Char *kTestStr37 = Sun Java Technology; static const sal_Char *kTestStr38 = \21\23\25\27\31\33\50; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/aqua
vcl/aqua/source/gdi/aquaprintaccessoryview.mm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1722c68c81974e509fe11910a5190c01e455d39e
Author: August Sodora aug...@gmail.com
Date: Thu Dec 1 17:44:41 2011 -0500
Fix build in macosx
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 3a7fc59..17ee5a4 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -774,7 +774,7 @@ static void linebreakCell( NSCell* pBtn, const
rtl::OUString i_rText )
if( nIndex nLen )
{
rtl::OUStringBuffer aBuf( i_rText );
-aBuf.setCharAt( nIndex, '\n' );
+aBuf[nIndex] = '\n';
pText = CreateNSString( aBuf.makeStringAndClear() );
[pBtn setTitle: pText];
[pText release];
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/smoketest/smoketest.scp |4 1 file changed, 4 insertions(+) New commits: commit d0f4bb87900c9a7cb59bba1660566e4a68d505a0 Author: Andras Timar ati...@suse.com Date: Thu Dec 1 23:45:26 2011 +0100 fix gid_Test_Dir_Common_Ure parent for MAC OS diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp index dc4f6d3..aaed44f 100644 --- a/scp2/source/smoketest/smoketest.scp +++ b/scp2/source/smoketest/smoketest.scp @@ -82,7 +82,11 @@ Directory gid_Test_Brand_Dir_Share_Test End Directory gid_Test_Dir_Common_Ure +#if defined MACOSX +ParentID = gid_Test_Dir_Bundle_Contents; +#else ParentID = gid_Test_Dir_Brand_Root; +#endif HostName = ure; Styles = (UREDIRECTORY); End ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postgresql/makefile.mk
postgresql/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d3793b2b6cde0cb7ee69472ebaecd7b98c30265 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Dec 2 00:20:31 2011 +0100 postgresql: correct TARFILE_MD5 diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index d75b0de..c47721b 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -40,7 +40,7 @@ MAJOR_VER=9.1 # --- Files TARFILE_NAME=$(EXT_PROJECT_NAME) -TARFILE_MD5=0981bda6548a8c8233ffce2b6e4b2a23 +TARFILE_MD5=061a9f17323117c9358ed60f33ecff78 # distro-specific builds want to link against a particular mysql library ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/source dbaccess/source
cui/source/dialogs/gallery.src|2 +-
cui/source/tabpages/numpages.src | 10 +-
dbaccess/source/ext/macromigration/macromigration.src |2 +-
dbaccess/source/ui/relationdesign/relation.src|2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 0443311761e0755bda21a627c684cf00ce32bafe
Author: Lior Kaplan kaplanl...@gmail.com
Date: Fri Dec 2 01:43:50 2011 +0200
Remove extra spaces from strings for translation
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index b1c53e6..0108027 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -450,7 +450,7 @@ String RID_SVXSTR_GALLERYPROPS_OBJECT
};
String RID_SVXSTR_GALLERY_READONLY
{
-Text [ en-US ] = (read-only) ;
+Text [ en-US ] = (read-only) ;
};
String RID_SVXSTR_GALLERY_ALLFILES
{
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 97b6686..ef3426b 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -192,12 +192,12 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
CurPos = 0 ;
StringList [ en-US ] =
{
- 1, 2, 3, ... ; 4/*SVX_NUM_ARABIC
*/; ;
- A, B, C, ... ; 0/*SVX_NUM_CHARS_UPPER_LETTER
*/; ;
+ 1, 2, 3, ... ; 4/*SVX_NUM_ARABIC
*/; ;
+ A, B, C, ... ; 0/*SVX_NUM_CHARS_UPPER_LETTER
*/; ;
a, b, c, ... ; 1/*SVX_NUM_CHARS_LOWER_LETTER */;
;
- I, II, III, ... ; 2/*SVX_NUM_ROMAN_UPPER */;
;
- i, ii, iii, ... ; 3/*SVX_NUM_ROMAN_LOWER */;
;
- A, .., AA, .., AAA, ... ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/;
;
+ I, II, III, ... ; 2/*SVX_NUM_ROMAN_UPPER */;
;
+ i, ii, iii, ... ; 3/*SVX_NUM_ROMAN_LOWER */;
;
+ A, .., AA, .., AAA, ... ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/;
;
a, .., aa, .., aaa, ... ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/;
;
Bullet ;6/*SVX_NUM_CHAR_SPECIAL*/;
;
Graphics ; 8/*SVX_NUM_BITMAP */;
;
diff --git a/dbaccess/source/ext/macromigration/macromigration.src
b/dbaccess/source/ext/macromigration/macromigration.src
index 5d1d9db..cea1841 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -438,7 +438,7 @@ String STR_WARNINGS
String STR_EXCEPTION
{
-Text [ en-US ] = caught exception: ;
+Text [ en-US ] = caught exception:;
};
commit 127c6a3dab9c3a3e7f0cbcea2571a3eb96f990c4
Author: Lior Kaplan kaplanl...@gmail.com
Date: Fri Dec 2 01:43:34 2011 +0200
Typo fix: Maybe - Maybe
diff --git a/dbaccess/source/ui/relationdesign/relation.src
b/dbaccess/source/ui/relationdesign/relation.src
index 4420ade..7b9a404 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -79,5 +79,5 @@ String STR_QUERY_REL_DELETE_WINDOW
String STR_QUERY_REL_COULD_NOT_CREATE
{
-Text [ en-US ] = The database could not create the relation. May be
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database.;
+Text [ en-US ] = The database could not create the relation. Maybe
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database.;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sw binfilter/bf_xmloff
binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx | 26 +--
binfilter/bf_xmloff/source/text/xmloff_txtimp.cxx|4 +-
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 43e9388234d6294c67f399be86e6acd308f7b386
Author: August Sodora aug...@gmail.com
Date: Thu Dec 1 18:53:37 2011 -0500
Remove charAt/setCharAt from binfilter
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx
b/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx
index 83fef26..4fd84db 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_crypter.cxx
@@ -72,7 +72,7 @@ void Crypter::Encrypt( rtl::OStringBuffer r ) const
while( nLen-- )
{
-r.setCharAt(i, r[i] ^ ( *p ^ (BYTE) ( cBuf[ 0 ] * nCryptPtr ) ));
+r[i] = r[i] ^ ( *p ^ (BYTE) ( cBuf[ 0 ] * nCryptPtr ) );
*p += ( nCryptPtr (PASSWDLEN-1) ) ? *(p+1) : cBuf[ 0 ];
if( !*p )
*p += 1;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
index 3ca6af4..7875e96 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx
@@ -795,10 +795,10 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer
rContent, sal_uInt16 nFormat
sal_Int32 nLength = rContent.getLength();
if ( ( nLength == 1
-lcl_ValidChar( rContent.charAt(0), nFormatType ) ) ||
+lcl_ValidChar( rContent[0], nFormatType ) ) ||
( nLength == 2
- lcl_ValidChar( rContent.charAt(0), nFormatType )
- rContent.charAt(1) == ' ' ) )
+ lcl_ValidChar( rContent[0], nFormatType )
+ rContent[1] == ' ' ) )
{
// don't quote single separator characters like space or percent,
// or separator characters followed by space (used in date formats)
@@ -815,7 +815,7 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer
rContent, sal_uInt16 nFormat
{
if ( nPos + 1 nLength )
{
-if ( nPos + 2 == nLength lcl_ValidChar(
rContent.charAt(nPos + 1), nFormatType ) )
+if ( nPos + 2 == nLength lcl_ValidChar( rContent[nPos + 1],
nFormatType ) )
{
// single character that doesn't need quoting
}
@@ -828,7 +828,7 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer
rContent, sal_uInt16 nFormat
}
if ( nPos 0 )
{
-if ( nPos == 1 lcl_ValidChar( rContent.charAt(0),
nFormatType ) )
+if ( nPos == 1 rContent.getLength() 0 lcl_ValidChar(
rContent[0], nFormatType ) )
{
// single character that doesn't need quoting
}
@@ -858,7 +858,7 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer
rContent, sal_uInt16 nFormat
sal_Int32 nPos = 0;
while ( nPos rContent.getLength() )
{
-if ( rContent.charAt( nPos ) == (sal_Unicode) '' )
+if ( rContent[nPos] == (sal_Unicode) '' )
{
rContent.insert( nPos, aInsert );
nPos += aInsert.getLength();
@@ -875,8 +875,8 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer
rContent, sal_uInt16 nFormat
if ( bEscape )
{
if ( rContent.getLength() 2
- rContent.charAt(0) == (sal_Unicode) ''
- rContent.charAt(1) == (sal_Unicode) '' )
+ rContent[0] == (sal_Unicode) ''
+ rContent[1] == (sal_Unicode) '' )
{
String aTrimmed( rContent.makeStringAndClear().copy(2) );
rContent = rtl::OUStringBuffer( aTrimmed );
@@ -884,8 +884,8 @@ void lcl_EnquoteIfNecessary( ::rtl::OUStringBuffer
rContent, sal_uInt16 nFormat
sal_Int32 nLen = rContent.getLength();
if ( nLen 2
- rContent.charAt(nLen-1) == (sal_Unicode) ''
- rContent.charAt(nLen-2) == (sal_Unicode) '' )
+ rContent[nLen - 1] == (sal_Unicode) ''
+ rContent[nLen - 2] == (sal_Unicode) '' )
{
String aTrimmed( rContent.makeStringAndClear().copy( 0, nLen -
2 ) );
rContent = rtl::OUStringBuffer( aTrimmed );
@@ -1827,14 +1827,14 @@ void SvXMLNumFormatContext::AddCurrency( const
::rtl::OUString rContent, Langua
// otherwise the currency symbol isn't recognized (#94048#)
sal_Int32 nLength = aFormatCode.getLength();
-if ( nLength 1 aFormatCode.charAt( nLength-1 ) == '' )
+if ( nLength 1 aFormatCode[nLength - 1] == '' )
{
// find start of quoted string
// When SvXMLNumFmtElementContext::EndElement
[Libreoffice-commits] .: sal/inc
sal/inc/rtl/strbuf.hxx | 36
sal/inc/rtl/ustrbuf.hxx | 36
2 files changed, 72 deletions(-)
New commits:
commit 1820e7f575dffe53062f50f08cebf0efa37e2cc2
Author: August Sodora aug...@gmail.com
Date: Thu Dec 1 18:58:46 2011 -0500
Remove charAt/setCharAt once and for all
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 3ea6bc0..e3ae74b 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -269,42 +269,6 @@ public:
}
/**
-Returns the character at a specific index in this string buffer.
-
-The first character of a string buffer is at index
-code0/code, the next at index code1/code, and so on, for
-array indexing.
-p
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the desired character.
-@return the character at the specified index of this string buffer.
-*/
-sal_Char charAt( sal_Int32 index )
-{
-assert(index = 0 index pData-length);
-return pData-buffer[ index ];
-}
-
-/**
-The character at the specified index of this string buffer is set
-to codech/code.
-
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the character to modify.
-@param ch the new character.
- */
-OStringBuffer setCharAt(sal_Int32 index, sal_Char ch)
-{
-assert(index = 0 index pData-length);
-pData-buffer[ index ] = ch;
-return *this;
-}
-
-/**
Return a null terminated character array.
*/
const sal_Char* getStr() const { return pData-buffer; }
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index b4d4871..624b6f0 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -248,42 +248,6 @@ public:
}
/**
-Returns the character at a specific index in this string buffer.
-
-The first character of a string buffer is at index
-code0/code, the next at index code1/code, and so on, for
-array indexing.
-p
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the desired character.
-@return the character at the specified index of this string buffer.
- */
-sal_Unicode charAt( sal_Int32 index ) const
-{
-assert(index = 0 index pData-length);
-return pData-buffer[ index ];
-}
-
-/**
-The character at the specified index of this string buffer is set
-to codech/code.
-
-The index argument must be greater than or equal to
-code0/code, and less than the length of this string buffer.
-
-@param index the index of the character to modify.
-@param ch the new character.
- */
-OUStringBuffer setCharAt(sal_Int32 index, sal_Unicode ch)
-{
-assert(index = 0 index pData-length);
-pData-buffer[ index ] = ch;
-return *this;
-}
-
-/**
Return a null terminated unicode character array.
*/
const sal_Unicode* getStr() const { return pData-buffer; }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
