[Libreoffice-commits] core.git: Changes to 'refs/changes/14/2514/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/2514/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/62/1962/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/1921/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/1921/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/1766/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/1766/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/1921/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/1624/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/1624/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/1766/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/1766/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/66/1766/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/78/2278/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/2364/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/2282/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/1924/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/2282/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/2279/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/2279/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/2279/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/24/1824/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/80/2280/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/2279/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/81/2281/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/80/2280/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/81/2281/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/84/1784/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/1954/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/1954/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/1954/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/1954/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/1954/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/84/1784/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/2155/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/2155/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source svl/inc svl/source sw/inc sw/source tools/source vcl/win
sd/inc/stlsheet.hxx |2 +-
sd/source/core/drawdoc3.cxx |2 +-
sd/source/core/stlpool.cxx| 14 +++---
sd/source/core/stlsheet.cxx |4 ++--
sd/source/ui/func/futempl.cxx |2 +-
svl/inc/svl/style.hxx |8
svl/source/items/style.cxx|4 ++--
sw/inc/docstyle.hxx |4 ++--
sw/inc/swtypes.hxx|1 +
sw/source/core/bastyp/swtypes.cxx |1 +
sw/source/core/fields/fldbas.cxx |5 -
sw/source/ui/app/docstyle.cxx | 12 ++--
tools/source/rc/resmgr.cxx|2 +-
vcl/win/source/gdi/salgdi3.cxx|8
14 files changed, 33 insertions(+), 36 deletions(-)
New commits:
commit 3bc29af446fd1d9bd267ade1b1a5fca725ca8166
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Sat Mar 2 15:40:14 2013 +0100
fdo#38838 Replaced some use of (Uni)String with OUString.
Change-Id: Iad623c9300919fbae34279268a5a720f978c6434
Reviewed-on: https://gerrit.libreoffice.org/2514
Reviewed-by: Joren De Cuyper joren.libreoff...@telenet.be
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 191bcf9..8476222 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -61,7 +61,7 @@ public:
virtual boolHasParentSupport() const;
virtual boolHasClearParentSupport() const;
virtual boolSetName( const UniString );
-virtual voidSetHelpId( const String r, sal_uLong nId );
+virtual voidSetHelpId( const OUString r, sal_uLong nId );
voidAdjustToFontHeight(SfxItemSet rSet, sal_Bool
bOnlyMissingItems = sal_True);
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index b811e32..2389beb 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1439,7 +1439,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
else
{
// create new style
-String aHelpFile;
+OUString aHelpFile;
pMySheet = static_castSfxStyleSheet*(
mxStyleSheetPool-Make(aName, SD_STYLE_FAMILY_MASTERPAGE,
pHisSheet-GetMask()) );
pMySheet-SetHelpId( aHelpFile,
pHisSheet-GetHelpId(aHelpFile) );
pMySheet-GetItemSet().ClearItem(0); // Delete all
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 8fb287f..86c6915 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -193,7 +193,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const
String rLayoutName, sal_Bo
* outline levels
**/
String aName(SdResId(STR_LAYOUT_OUTLINE));
-String aHelpFile;
+OUString aHelpFile;
SfxStyleSheetBase* pParent = NULL;
SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE );
@@ -599,7 +599,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool
rSourcePool, SfxStyleFamily
void SdStyleSheetPool::CopySheets(SdStyleSheetPool rSourcePool,
SfxStyleFamily eFamily, SdStyleSheetVector rCreatedSheets)
{
-String aHelpFile;
+OUString aHelpFile;
sal_uInt32 nCount = rSourcePool.aStyles.size();
@@ -659,7 +659,7 @@ void SdStyleSheetPool::CopyLayoutSheets(const String
rLayoutName, SdStyleSheetP
std::vectorString aNameList;
CreateLayoutSheetNames(rLayoutName,aNameList);
-String sEmpty;
+OUString sEmpty;
for (std::vectorString::const_iterator it = aNameList.begin(); it !=
aNameList.end(); ++it)
{
pSheet = Find(*it, SD_STYLE_FAMILY_MASTERPAGE);
@@ -784,7 +784,7 @@ void SdStyleSheetPool::CreateLayoutSheetList(const String
rLayoutName, SdStyleS
void SdStyleSheetPool::CreatePseudosIfNecessary()
{
String aName;
-String aHelpFile;
+OUString aHelpFile;
SfxStyleSheetBase* pSheet = NULL;
SfxStyleSheetBase* pParent = NULL;
@@ -869,7 +869,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
void SdStyleSheetPool::UpdateStdNames()
{
-String aHelpFile;
+OUString aHelpFile;
sal_uInt32 nCount = aStyles.size();
std::vectorSfxStyleSheetBase* aEraseList;
@@ -880,7 +880,7 @@ void SdStyleSheetPool::UpdateStdNames()
if( !pStyle-IsUserDefined() )
{
String aOldName = pStyle-GetName();
-sal_uLong nHelpId = pStyle-GetHelpId( aHelpFile );
+sal_uLong nHelpId = pStyle-GetHelpId( aHelpFile );
SfxStyleFamily eFam = pStyle-GetFamily();
sal_Bool bHelpKnown = sal_True;
@@ -972,7 +972,7 @@ void SdStyleSheetPool::UpdateStdNames()
void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
Font rBulletFont )
{
-String aHelpFile;
+
Compile error in salgdi2.cxx on linux with -Werror
Hello guys, I am getting a compile error on linux because I am using -Werror. See down below: /home/djano/libreoffice-core-gcc9/vcl/unx/generic/gdi/salgdi2.cxx: In member function ‘bool X11SalGraphics::drawAlphaBitmapOpt(const SalTwoRect, const SalBitmap, const SalBitmap, bool)’: /home/djano/libreoffice-core-gcc9/vcl/unx/generic/gdi/salgdi2.cxx:763:42: error: ‘aAlphaPM’ may be used uninitialized in this function [-Werror=maybe-uninitialized] In file included from /home/djano/libreoffice-core-gcc9/vcl/unx/generic/gdi/salgdi2.cxx:34:0: /home/djano/libreoffice-core-gcc9/vcl/unx/generic/gdi/xrender_peer.hxx:126:84: error: ‘aAlphaPic’ may be used uninitialized in this function [-Werror=maybe-uninitialized] /home/djano/libreoffice-core-gcc9/vcl/unx/generic/gdi/salgdi2.cxx:661:13: note: ‘aAlphaPic’ was declared here cc1plus: all warnings being treated as errors This code was committed yesterday. I am not sure what should aAlphaPM be initialized to? Also why is all the code not currently compiled with -Werror? Is it because it would slow down the build? Or is it because there are false positive warnings? IMHO, using -Werror could prevent many mistakes. Cheers, Jean-Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: hola
Hi Adriam,
I think you are on the correct mailing list to get your answer.
However, this is an English-writing mailing list.
Writing in any other language than English will more than likely bring no
answer.
Jean-Noël
PS: I do not have the answer to your question.
2013/3/7 Adriam Delgado Rivero adriv...@estudiantes.uci.cu
Utilizando UNO API para java y cargo una plantilla que contiene una tabla
Intento copiar dicha tabla en la siguiente hoja (propiedades también)
para crear una nueva y no encuentro como, este es el código donde
obtengo la tabla y sus propiedades.
PD. He escrito muchas veces a us...@global.libreoffice.org pero nadie
responde...
Saludos
// first query the XTextTablesSupplier interface from our document
XTextTablesSupplier xTablesSupplier = (XTextTablesSupplier)
UnoRuntime.queryInterface(
XTextTablesSupplier.class, xWriterComponent);
// get the tables collection
XNameAccess xNamedTables = xTablesSupplier.getTextTables();
// now query the XIndexAccess from the tables collection
XIndexAccess xIndexedTables = (XIndexAccess)
UnoRuntime.queryInterface(
XIndexAccess.class, xNamedTables);
// we need properties
xTableProps = null;
// get the tables
for (int i = 0; i xIndexedTables.getCount(); i++) {
table = xIndexedTables.getByIndex(i);
// the properties, please!
xTableProps = (XPropertySet) UnoRuntime.queryInterface(
XPropertySet.class, table);
this.xTable = (XTextTable) UnoRuntime.queryInterface(
XTextTable.class, table);
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/inc editeng/source l10ntools/inc l10ntools/source sfx2/inc sfx2/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source writerfilter/inc writerfilter/s
editeng/inc/editeng/editobj.hxx|2
editeng/source/editeng/editobj.cxx | 10 -
l10ntools/inc/po.hxx |1
l10ntools/source/po.cxx|7 -
sfx2/inc/sfx2/templateabstractview.hxx |2
sfx2/source/control/templateabstractview.cxx |5
tools/inc/tools/line.hxx |1
tools/source/generic/line.cxx | 57
--
unusedcode.easy| 14 --
vcl/inc/outfont.hxx|2
vcl/inc/vcl/settings.hxx |1
vcl/inc/vcl/svapp.hxx |1
vcl/source/app/settings.cxx|6 -
vcl/source/app/svapp.cxx |6 -
vcl/source/gdi/outdev3.cxx |8 -
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx|2
writerfilter/source/resourcemodel/util.cxx | 20 ---
writerfilter/source/rtftok/rtfsprm.cxx |7 -
writerfilter/source/rtftok/rtfsprm.hxx |1
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 26
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 26
21 files changed, 1 insertion(+), 204 deletions(-)
New commits:
commit 875c997c7da116402509d0bd75e8c15a66a40529
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Wed Feb 6 14:47:47 2013 +0100
fdo#39446 - Bloat Removal. Removing uncallable code with callcatcher
Removed several unused methods.
Could not remove ScVbaFormatooo::vba::excel::XStyle::getAddIndent() and
ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any
const) because it breaks compilation (they are implementing pure virtual
methods).
Should Test::test1Table1Page() really be removed? (test class)
Conflicts:
unusedcode.easy
Change-Id: I98a761f66f28e3a82661c10a5fa1dc7e109fff2f
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 271a39b..bfce8fd 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -96,14 +96,12 @@ public:
void GetCharAttribs( sal_uInt16 nPara, std::vectorEECharAttrib rLst )
const;
bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
-bool RemoveParaAttribs( sal_uInt16 nWhich = 0 );
bool IsFieldObject() const;
const SvxFieldItem* GetField() const;
bool HasField( sal_Int32 nType =
com::sun::star::text::textfield::Type::UNSPECIFIED ) const;
const SfxItemSet GetParaAttribs(size_t nPara) const;
-void SetParaAttribs(size_t nPara, const SfxItemSet rAttribs);
void GetStyleSheet(size_t nPara, String rName, SfxStyleFamily eFamily)
const;
void SetStyleSheet(size_t nPara, const String rName, const
SfxStyleFamily eFamily);
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 34b91b7..ea12eca 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -266,21 +266,11 @@ const SfxItemSet EditTextObject::GetParaAttribs(size_t
nPara) const
return mpImpl-GetParaAttribs(nPara);
}
-void EditTextObject::SetParaAttribs(size_t nPara, const SfxItemSet rAttribs)
-{
-mpImpl-SetParaAttribs(nPara, rAttribs);
-}
-
bool EditTextObject::RemoveCharAttribs( sal_uInt16 nWhich )
{
return mpImpl-RemoveCharAttribs(nWhich);
}
-bool EditTextObject::RemoveParaAttribs( sal_uInt16 nWhich )
-{
-return mpImpl-RemoveParaAttribs(nWhich);
-}
-
void EditTextObject::GetStyleSheet(size_t nPara, String rName,
SfxStyleFamily eFamily) const
{
mpImpl-GetStyleSheet(nPara, rName, eFamily);
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index a84b5a0..f3f6d6d 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -89,7 +89,6 @@ public:
friend class PoOfstream;
friend class PoIfstream;
-PoHeader();
PoHeader( const OString rExtSrc );
PoHeader( std::ifstream rOldPo );
~PoHeader();
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 23506ad..90b7f79 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -631,13 +631,6 @@ namespace
}
}
-//Default Constructor
-PoHeader::PoHeader()
-: m_pGenPo( 0 )
-, m_bIsInitialized( false )
-{
-}
-
//Template Constructor
PoHeader::PoHeader( const OString rExtSrc )
: m_pGenPo( new GenPoEntry() )
diff --git a/sfx2/inc/sfx2/templateabstractview.hxx
b/sfx2/inc/sfx2/templateabstractview.hxx
index a5fef71..90dba09 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++
[Libreoffice-commits] core.git: cui/source dbaccess/source editeng/source sc/source
cui/source/tabpages/autocdlg.cxx |8 --
dbaccess/source/ui/dlg/DbAdminImpl.cxx| 20 ++-
dbaccess/source/ui/dlg/directsql.cxx | 10 +--
dbaccess/source/ui/querydesign/QueryTableView.cxx |6 --
dbaccess/source/ui/tabledesign/TEditControl.cxx |3 -
editeng/source/items/frmitems.cxx |4 -
editeng/source/items/itemtype.cxx | 16 ++---
editeng/source/outliner/outliner.cxx |2
sc/source/core/data/attrib.cxx|2
sc/source/core/data/docpool.cxx |4 -
sc/source/core/data/dputil.cxx|6 +-
sc/source/core/data/drwlayer.cxx |2
sc/source/core/data/global.cxx|3 -
sc/source/core/data/table4.cxx| 17 ++
sc/source/core/tool/address.cxx |8 --
sc/source/core/tool/compiler.cxx | 10 ---
sc/source/filter/excel/excdoc.cxx |3 -
sc/source/filter/excel/namebuff.cxx | 16 ++---
sc/source/filter/ftools/ftools.cxx|4 -
sc/source/filter/html/htmlexp.cxx |9 +--
sc/source/filter/starcalc/scflt.cxx |5 -
sc/source/filter/xml/xmlwrap.cxx |6 +-
sc/source/ui/dbgui/asciiopt.cxx | 61 --
sc/source/ui/dbgui/csvruler.cxx |8 +-
sc/source/ui/dbgui/imoptdlg.cxx | 23 +++-
sc/source/ui/dbgui/sortkeydlg.cxx |4 -
sc/source/ui/docshell/docsh8.cxx | 42 ++-
sc/source/ui/formdlg/dwfunctr.cxx |8 +-
sc/source/ui/miscdlgs/optsolver.cxx |6 --
sc/source/ui/miscdlgs/sharedocdlg.cxx |6 --
sc/source/ui/navipi/content.cxx | 19 +++---
sc/source/ui/unoobj/chart2uno.cxx |5 -
sc/source/ui/vba/vbaworksheet.cxx |7 +-
sc/source/ui/vba/vbaworksheets.cxx|6 --
sc/source/ui/view/cellsh.cxx |9 +--
sc/source/ui/view/cellsh3.cxx |3 -
sc/source/ui/view/dbfunc3.cxx |5 -
sc/source/ui/view/gridwin4.cxx|3 -
sc/source/ui/view/preview.cxx | 10 +--
sc/source/ui/view/prevwsh.cxx | 20 ++-
sc/source/ui/view/tabview.cxx | 10 +--
sc/source/ui/view/tabview4.cxx| 16 ++---
sc/source/ui/view/viewdata.cxx| 45 +---
43 files changed, 183 insertions(+), 297 deletions(-)
New commits:
commit 465dbaecf9890b7117a45d02ea982ef7aca32720
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Sun Feb 24 16:08:05 2013 +0100
fdo#38838 Replaced some use of (Xub)String with OUString.
Change-Id: I5a8f2d1a5762c20d21d31b04778a9e2cac8df9cb
Reviewed-on: https://gerrit.libreoffice.org/2364
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 6c5d2fb..6df09af 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -683,9 +683,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet )
aCheckLB.SetUserData( REPLACE_BULLETS, pUserData );
nPercent = pOpt-nRightMargin;
-sMargin = ' ';
-sMargin += OUString::number( nPercent );
-sMargin += '%';
+sMargin = + OUString::number( nPercent ) + %;
pUserData = new ImpUserData(sMargin, 0);
aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
@@ -739,9 +737,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
if(RET_OK == aDlg.Execute())
{
nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
-sMargin = ' ';
-sMargin += OUString::number( nPercent );
-sMargin += '%';
+sMargin = + OUString::number( nPercent ) + %;
}
}
aCheckLB.Invalidate();
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a8f028f..c434242 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -135,8 +135,7 @@ namespace
if ( _pPortNumber )
{
-sNewUrl += OUString::createFromAscii(:);
-sNewUrl += OUString::number(_pPortNumber-GetValue());
+sNewUrl = sNewUrl + : +
OUString::number(_pPortNumber-GetValue());
}
return sNewUrl;
@@ -472,7 +471,7 @@ sal_Bool
ODbDataSourceAdministrationHelper::hasAuthentication(const SfxItemSet
//
-
String ODbDataSourceAdministrationHelper::getConnectionURL() const
{
-String sNewUrl;
+
[Libreoffice-commits] core.git: cui/source dbaccess/source editeng/source sfx2/source sot/source starmath/source svtools/bmpmaker svtools/source tools/inc tools/source ucb/workben unotools/source vcl/
cui/source/tabpages/autocdlg.cxx |4 +--
dbaccess/source/ext/macromigration/macromigrationpages.cxx |4 +--
dbaccess/source/ui/control/FieldDescControl.cxx|6 ++--
dbaccess/source/ui/control/TableGrantCtrl.cxx |2 -
dbaccess/source/ui/dlg/directsql.cxx |2 -
dbaccess/source/ui/dlg/indexdialog.cxx |2 -
dbaccess/source/ui/dlg/sqlmessage.cxx |2 -
dbaccess/source/ui/querydesign/QueryTableView.cxx |2 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |4 +--
dbaccess/source/ui/tabledesign/TEditControl.cxx|8 +++---
editeng/source/items/frmitems.cxx |8 +++---
editeng/source/items/itemtype.cxx | 10
editeng/source/outliner/outliner.cxx |2 -
sfx2/source/appl/childwin.cxx |4 +--
sfx2/source/appl/newhelp.cxx | 16 ++---
sfx2/source/bastyp/frmhtmlw.cxx| 10
sfx2/source/dialog/basedlgs.cxx| 10
sfx2/source/dialog/dinfdlg.cxx | 14 +--
sfx2/source/dialog/dockwin.cxx | 16 ++---
sfx2/source/dialog/filedlghelper.cxx |6 ++--
sfx2/source/dialog/mgetempl.cxx|4 +--
sfx2/source/dialog/passwd.cxx |2 -
sfx2/source/dialog/splitwin.cxx|4 +--
sfx2/source/dialog/srchdlg.cxx |8 +++---
sfx2/source/dialog/tabdlg.cxx | 10
sfx2/source/view/viewfrm2.cxx |2 -
sot/source/sdstor/stg.cxx |4 +--
sot/source/sdstor/ucbstorage.cxx |2 -
starmath/source/mathtype.cxx |4 +--
svtools/bmpmaker/bmpcore.cxx |2 -
svtools/source/contnr/fileview.cxx |6 ++--
svtools/source/contnr/svtabbx.cxx |4 +--
svtools/source/control/calendar.cxx|8 +++---
svtools/source/control/toolbarmenuacc.cxx |2 -
svtools/source/dialogs/prnsetup.cxx|2 -
svtools/source/urlobj/inetimg.cxx |4 +--
tools/inc/tools/string.hxx |1
tools/source/generic/bigint.cxx| 10
tools/source/string/tustring.cxx |5
ucb/workben/ucb/ucbdemo.cxx|2 -
unotools/source/ucbhelper/tempfile.cxx |4 +--
vcl/aqua/source/app/salsys.cxx |2 -
vcl/ios/source/app/salsys.cxx |2 -
vcl/source/control/field2.cxx |4 +--
vcl/unx/gtk/gdi/salprn-gtk.cxx |6 ++--
45 files changed, 115 insertions(+), 121 deletions(-)
New commits:
commit 63b0ce97ba0f71c28a7880c741100b0240332e74
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Wed Feb 20 00:21:37 2013 +0100
fdo#38838 searched, replaced and removed String::CreateFromInt32().
I ran the following code replace:
s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/
And finally removed String::CreateFromInt32().
Change-Id: I53b26a59c68511ae09f0ee82cfade210d0de3fa5
Reviewed-on: https://gerrit.libreoffice.org/2279
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 42ece11..8f451d6 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -684,7 +684,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet )
nPercent = pOpt-nRightMargin;
sMargin = ' ';
-sMargin += String::CreateFromInt32( nPercent );
+sMargin += OUString::number( nPercent );
sMargin += '%';
pUserData = new ImpUserData(sMargin, 0);
aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
@@ -740,7 +740,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
{
nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
sMargin = ' ';
-sMargin += String::CreateFromInt32( nPercent );
+sMargin += OUString::number( nPercent );
sMargin += '%';
}
}
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/docpool.cxx |4 +-
sc/source/core/data/dpdimsave.cxx |2 -
sc/source/core/data/dputil.cxx |2 -
sc/source/core/data/drwlayer.cxx|2 -
sc/source/core/data/global.cxx |4 +-
sc/source/core/data/stlpool.cxx |2 -
sc/source/core/data/table4.cxx |4 +-
sc/source/core/tool/address.cxx | 12 +++
sc/source/core/tool/compiler.cxx|8 ++--
sc/source/filter/excel/excdoc.cxx |2 -
sc/source/filter/excel/excform.cxx |2 -
sc/source/filter/excel/excform8.cxx |2 -
sc/source/filter/excel/namebuff.cxx | 10 ++---
sc/source/filter/excel/xehelper.cxx |2 -
sc/source/filter/excel/xename.cxx |2 -
sc/source/filter/excel/xistyle.cxx |2 -
sc/source/filter/ftools/ftools.cxx |4 +-
sc/source/filter/html/htmlexp.cxx |2 -
sc/source/filter/starcalc/scflt.cxx |2 -
sc/source/filter/xml/xmlwrap.cxx|4 +-
sc/source/ui/Accessibility/AccessibleCsvControl.cxx |2 -
sc/source/ui/dbgui/asciiopt.cxx | 12 +++
sc/source/ui/dbgui/csvgrid.cxx |2 -
sc/source/ui/dbgui/csvruler.cxx |4 +-
sc/source/ui/dbgui/imoptdlg.cxx |4 +-
sc/source/ui/dbgui/sortkeydlg.cxx |2 -
sc/source/ui/docshell/dbdocimp.cxx |2 -
sc/source/ui/docshell/docsh5.cxx|2 -
sc/source/ui/docshell/docsh8.cxx| 16 -
sc/source/ui/docshell/impex.cxx | 16 -
sc/source/ui/docshell/tpstat.cxx|6 +--
sc/source/ui/formdlg/dwfunctr.cxx |4 +-
sc/source/ui/miscdlgs/acredlin.cxx |4 +-
sc/source/ui/miscdlgs/instbdlg.cxx |2 -
sc/source/ui/miscdlgs/optsolver.cxx |2 -
sc/source/ui/miscdlgs/sharedocdlg.cxx |2 -
sc/source/ui/navipi/content.cxx |2 -
sc/source/ui/unoobj/chart2uno.cxx |6 +--
sc/source/ui/unoobj/filtuno.cxx |2 -
sc/source/ui/vba/vbaworksheet.cxx |4 +-
sc/source/ui/vba/vbaworksheets.cxx |4 +-
sc/source/ui/view/cellsh.cxx|4 +-
sc/source/ui/view/cellsh3.cxx |2 -
sc/source/ui/view/colrowba.cxx |4 +-
sc/source/ui/view/dbfunc3.cxx |2 -
sc/source/ui/view/gridwin4.cxx |2 -
sc/source/ui/view/preview.cxx |4 +-
sc/source/ui/view/prevwsh.cxx | 12 +++
sc/source/ui/view/printfun.cxx |2 -
sc/source/ui/view/tabview.cxx |2 -
sc/source/ui/view/tabview4.cxx |8 ++--
sc/source/ui/view/viewdata.cxx | 34 ++--
52 files changed, 125 insertions(+), 125 deletions(-)
New commits:
commit bb5fa449378d6535932d39f2357c06e181647346
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Wed Feb 20 00:17:30 2013 +0100
fdo#38838 search replace for String::CreateFromInt32().
I ran the following code replace:
s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/
Change-Id: I45edaec4de2481ad45f9bcae2e280d5aca487714
Reviewed-on: https://gerrit.libreoffice.org/2281
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 535a480..e7f008c 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -917,7 +917,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
case SFX_ITEM_PRESENTATION_NAMELESS:
{
String aPages( ScGlobal::GetRscString(
STR_SCATTR_PAGE_SCALE_PAGES ) );
-aPages.SearchAndReplaceAscii( %1,
String::CreateFromInt32( nPagNo ) );
+aPages.SearchAndReplaceAscii( %1, OUString::number(
nPagNo ) );
rText += aPages;
}
break;
@@ -946,7 +946,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
rText =
ScGlobal::GetRscString(STR_SCATTR_PAGE_FIRSTPAGENO) + aStrSep;
// break; // DURCHFALLEN!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
-rText += String::CreateFromInt32( nPagNo );
+rText += OUString::number(
Re: [Libreoffice-qa] minutes of ESC call ...
2013/2/21 Lubos Lunak l.lu...@suse.cz On Thursday 21 of February 2013, Michael Meeks wrote: Hi Lubos, On Mon, 2013-02-18 at 15:01 +0100, Lubos Lunak wrote: All I'm saying is that 'do not merge' is vague enough to not say what it in fact does or where the line between -1 and -2 is, and 'I disagree with the change, needs discussion first' or similar is clearer there and still reasonably short. So can you propose a better string ? how about this one: block merging for now Which is brief, open-ended, uses merge not submit and describes the function of -2 perhaps better to both reviewer and reviewee. This is again vague enough to apply to -1 as well (-1 is also block merging for now). I did propose already one string I think is better, but if you want to put it this way, then it should be e.g. block merging until objections are cleared or so. How about Do not merge, let's discuss the approach or Do not merge, let's discuss the design? This is inviting and explains that the code won't be merge as without discussing the design. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/global.hxx |4 ++--
sc/inc/scabstdlg.hxx |4 ++--
sc/source/core/data/docpool.cxx|4 ++--
sc/source/core/data/global.cxx | 10 +-
sc/source/core/data/table3.cxx |4 ++--
sc/source/core/tool/compiler.cxx |2 +-
sc/source/filter/xml/xmlwrap.cxx |8
sc/source/ui/attrdlg/scdlgfact.cxx |4 ++--
sc/source/ui/attrdlg/scdlgfact.hxx |4 ++--
sc/source/ui/inc/inscodlg.hxx |6 +++---
sc/source/ui/miscdlgs/inscodlg.cxx |2 +-
11 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 742515639168cd35a0c2036a5bf6c46b2a3a554e
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Thu Feb 14 20:15:38 2013 +0100
fdo#38838 ScGlobal::GetRscString() now returns OUString instead of String.
Cleaned up the call sites.
Change-Id: I6c688cecd4f872ed064ccfa3af4b402a779860dc
Reviewed-on: https://gerrit.libreoffice.org/2155
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 53ede60..978985a 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -494,7 +494,7 @@ class ScGlobal
static FuncCollection* pFuncCollection;
static ScUnoAddInCollection* pAddInCollection;
static ScUserList* pUserList;
-static String** ppRscString;
+static OUString** ppRscString;
static String* pStrScDoc;
static String* pEmptyString;
static ::rtl::OUString* pEmptyOUString;
@@ -553,7 +553,7 @@ public:
SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
SC_DLLPUBLIC static ScUserList* GetUserList();
static void SetUserList( const ScUserList* pNewList );
-SC_DLLPUBLIC static const String GetRscString( sal_uInt16 nIndex );
+SC_DLLPUBLIC static const OUString GetRscString( sal_uInt16 nIndex
);
static void OpenURL( const String rURL, const String
rTarget );
SC_DLLPUBLIC static String GetAbsDocName( const String
rFileName,
SfxObjectShell* pShell );
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 0dc4345..4113b64 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -388,8 +388,8 @@ public:
virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*
pParent, //add for ScInsertContentsDlg
int nId,
-sal_uInt16
nCheckDefaults = 0,
-const
String* pStrTitle = NULL ) = 0;
+sal_uInt16
nCheckDefaults = 0,
+const
OUString* pStrTitle = NULL ) = 0;
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent,
ScViewData rViewData,
SCTAB nTabCount, bool bFromFile) = 0;
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 8a4e870..535a480 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -994,7 +994,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ),
ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
-rText = OUString(ScGlobal::GetRscString(STR_HEADER)) + ( +
aBuffer + ) ;
+rText = ScGlobal::GetRscString(STR_HEADER) + ( + aBuffer +
) ;
}
}
break;
@@ -1005,7 +1005,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ),
ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
-rText = OUString(ScGlobal::GetRscString(STR_FOOTER)) + ( +
aBuffer + ) ;
+rText = ScGlobal::GetRscString(STR_FOOTER) + ( + aBuffer +
) ;
}
}
break;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 3a00dd5..0d0a3d0 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -88,7 +88,7 @@ ScAutoFormat* ScGlobal::pAutoFormat = NULL;
FuncCollection* ScGlobal::pFuncCollection = NULL;
ScUnoAddInCollection* ScGlobal::pAddInCollection = NULL;
ScUserList* ScGlobal::pUserList = NULL;
-String**ScGlobal::ppRscString = NULL;
+OUString** ScGlobal::ppRscString = NULL;
LanguageTypeScGlobal::eLnge = LANGUAGE_SYSTEM;
::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL;
SvtSysLocale* ScGlobal::pSysLocale = NULL;
@@ -339,7 +339,7 @@ void ScGlobal::SetUserList(
Re: Unable to build due to libwpd-stream.h missing
2013/2/19 Jack Wakefield jackwakefiel...@gmail.com Hello, I'm unable to build the latest LibreOffice git on ArchLinux due to the following error: VSDInternalStream.h:37:41: fatal error: libwpd-stream/libwpd-stream.h: No such file or directory Hi Jack, I have the same problem with a fresh LibreOffice build on linux mint 14. Thanks, Jean-Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: regarding patch 38838
Hi Prashant, 2013/2/17 Prashant Pandey prashant3.yi...@gmail.com Hi, I need some guidance as am stuck at a place. How should I replace 'erase' using guidelines given under https://wiki.documentfoundation.org/Development/String_Classes. If I try to fit 'replaceAt' in place of 'erase' in the line bolded below: *aRealStyle.Erase(aRealStyle.Search(aSep) + aSep.Len());* it will give me error (if I do : *aRealStyle.replaceAt(aRealStyle.indexOf(aSep) + aSep.getLength());*) Reason: replaceAt defined as: rtl::OUString rtl::OUString::replaceAt(sal_Int32, sal_Int32, const rtl::OUString) const (candidate expects 3 arguments, 1 provided) error: no matching function for call to ‘rtl::OUString::replaceAt(sal_Int32) My question is, what should I pass inside the replaceAt() parameters/arguments? I would suggest you write this: *sal_int32 idx = **aRealStyle.indexOf(aSep) + aSep.getLength();* ***aRealStyle = aRealStyle.replaceAt(idx, **aRealStyle.getLength() - **aRealStyle, );* Because: - If nIndex is set then can use replaceAt with an arg of an empty string (from the wiki page) - The second argument is the count, and here we replace until the end of the string - Since OUString is immutable, you must assign back the resulting OUString if you do not want to lose it Cheers, Jean-Noël ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: regarding patch 38838
2013/2/16 Prashant Pandey prashant3.yi...@gmail.com Hi Jean-Noel, I am an undergrad student from India, new to the open source world, and trying contribute something good and productive to it. I am happy to see you actively work on Patch 38838 :) and am also working on the same patch since last few days and trying hard to get touch with it comfortably. However, things are not going in their best way. Can you help me with fixing the same bug and getting me more comfortable with it. What is the way to replace String with OUString. Is it anywhere I see them, I just need to replace them or there are other factors also I need to take them under consideration? I shall be grateful to you for being patient and helping/guiding me for the same :) Waiting for your earliest reply Thanks and Regards Prashant Pandey Hi Prashant, Welcome on board! The more people work on this bug the faster it will be solved and it is a big one. I suggets you take a look at this page: https://wiki.documentfoundation.org/Development/String_Classes It outlines how to replace String/UniString/XubString (the 2 latter are #define's of String) with OUString. You can also take a look at the doc for OUString ( http://api.libreoffice.org/docs/cpp/ref/classrtl_1_1_o_u_string.html ) and OUStringBuffer ( http://api.libreoffice.org/docs/cpp/ref/classrtl_1_1_o_u_string_buffer.html). Since OUString is immutable it is to be used when a String does not change or not much, while OUStringBuffer is to be used to build an OUString. I suggest you read these pages and take a look at previous commits on http://cgit.freedesktop.org/libreoffice/core/log/ where you can do queries to find the relevant commits. Also I suggest you subscribe to the developer's mailing list and ask your questions regarding this bug there. Thanks and good luck! Jean-Noël ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Strange loop in vcl/source/control/combobox
Hello,
I have been looking at the following code, but struggle a bit to understand
how this loop is working in IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) :
xub_StrLen nIndex = 0;
while ( nIndex != STRING_NOTFOUND )
{
xub_StrLen nPrevIndex = nIndex;
XubString aToken = aText.GetToken( 0, mcMultiSep, nIndex
);
xub_StrLen nTokenLen = aToken.Len();
aToken = comphelper::string::strip(aToken, ' ');
sal_uInt16 nP = mpImplLB-GetEntryList()-FindEntry(
aToken );
if ( (nP != LISTBOX_ENTRY_NOTFOUND)
(!mpImplLB-GetEntryList()-IsEntryPosSelected( nP )) )
{
aText.Erase( nPrevIndex, nTokenLen );
nIndex = sal::static_int_castxub_StrLen(nIndex -
nTokenLen);
if ( (nPrevIndex aText.Len()) (aText.GetChar(
nPrevIndex ) == mcMultiSep) )
{
aText.Erase( nPrevIndex, 1 );
nIndex--;
}
}
aText = comphelper::string::strip(aText, ' ');
}
My problem lies with how the nIndex variable gets updated, I don't see how
it can reach STRING_NOTFOUND any other way than by luck. I must be missing
something.
Does anybody have a better read than me here?
BTW I am trying to convert this code to use OUString, so any suggestion in
this direction is more than welcome :)
Cheers,
Jean--Noël
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Strange loop in vcl/source/control/combobox
2013/2/13 julien2412 serval2...@yahoo.fr
About STRING_NOTFOUND, you can take a look to getToken function in
tools/source/string/tustring.cxx since this function is called line 388:
385 while ( nIndex != STRING_NOTFOUND )
386 {
387 xub_StrLen nPrevIndex = nIndex;
388 XubString aToken = aText.GetToken( 0, mcMultiSep,
nIndex );
Pass by ref! Coming from Java, I did not think about it.
It makes sense now.
Thank you!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source sfx2/source svtools/source svx/inc svx/source sw/source tools/inc tools/source ucb/workben vcl/inc vcl/source vcl/unx vcl/win
cui/source/dialogs/cuigaldlg.cxx| 20 ++--
cui/source/inc/cuigaldlg.hxx|2 +-
sfx2/source/dialog/mgetempl.cxx |6 +++---
sfx2/source/dialog/styledlg.cxx |4 +---
sfx2/source/doc/objcont.cxx |6 +++---
svtools/source/dialogs/filedlg2.cxx | 24 +++-
svtools/source/dialogs/filedlg2.hxx |4 ++--
svx/inc/svx/fmview.hxx |2 +-
svx/source/form/filtnav.cxx | 22 +++---
svx/source/form/fmpage.cxx |8
svx/source/form/fmshimp.cxx | 22 +++---
svx/source/form/fmsrcimp.cxx| 17 -
svx/source/form/fmview.cxx | 10 +-
svx/source/form/tabwin.cxx |9 +++--
svx/source/inc/filtnav.hxx |2 +-
sw/source/core/edit/editsh.cxx |2 +-
tools/inc/tools/resmgr.hxx |8
tools/source/inet/inetstrm.cxx |5 ++---
tools/source/rc/resmgr.cxx | 24
ucb/workben/ucb/ucbdemo.cxx | 30 +++---
vcl/inc/salwtype.hxx|4 ++--
vcl/inc/vcl/graph.hxx |2 +-
vcl/inc/win/saldata.hxx |2 +-
vcl/inc/window.h|2 +-
vcl/source/filter/wmf/winwmf.cxx|2 +-
vcl/source/gdi/cvtsvm.cxx | 14 +++---
vcl/source/gdi/graph.cxx| 20 ++--
vcl/source/gdi/jobset.cxx |4 ++--
vcl/source/window/winproc.cxx | 26 +++---
vcl/unx/gtk/window/gtkframe.cxx | 10 +-
vcl/win/source/app/saldata.cxx |4 ++--
vcl/win/source/gdi/salgdi3.cxx |2 +-
32 files changed, 149 insertions(+), 170 deletions(-)
New commits:
commit 9e310cc32923ceb4b18d97ce68d54a339b935f01
Author: Jean-Noël Rouvignac jn.rouvig...@gmail.com
Date: Fri Feb 8 09:06:10 2013 +0100
fdo#38838 Some removal/replacement of the String/UniString with OUString
Change-Id: I6daea312198fae3a9717bd8d4fea6371aa4cd275
Reviewed-on: https://gerrit.libreoffice.org/1962
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index a683467..f7ed15f 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -179,7 +179,7 @@ void SearchThread::ImplSearch( const INetURLObject
rStartURL,
SolarMutexGuard aGuard;
mpBrowser-aFoundList.push_back(
-new String( aFoundURL.GetMainURL(
INetURLObject::NO_DECODE ) )
+aFoundURL.GetMainURL( INetURLObject::NO_DECODE
)
);
mpBrowser-aLbxFound.InsertEntry(
GetReducedString( aFoundURL, 50 ),
@@ -309,9 +309,9 @@ void TakeThread::execute()
for( sal_uInt16 i = 0; i nEntries schedule(); i++ )
{
if( mpBrowser-bTakeAll )
-aURL = INetURLObject( *mpBrowser-aFoundList[ nPos = i ] );
+aURL = INetURLObject( mpBrowser-aFoundList[ nPos = i ] );
else
-aURL = INetURLObject(*mpBrowser-aFoundList[ nPos =
mpBrowser-aLbxFound.GetSelectEntryPos( i ) ]);
+aURL = INetURLObject( mpBrowser-aFoundList[ nPos =
mpBrowser-aLbxFound.GetSelectEntryPos( i ) ]);
mrTakenList.push_back( (sal_uLong)nPos );
@@ -390,14 +390,12 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
// refill found list
for( i = 0, nCount = aRemoveEntries.size(); i nCount; ++i )
if( !aRemoveEntries[ i ] )
-aRemainingVector.push_back( *mpBrowser-aFoundList[ i ] );
+aRemainingVector.push_back( mpBrowser-aFoundList[i] );
-for ( i = 0, nCount = mpBrowser-aFoundList.size(); i nCount; ++i )
-delete mpBrowser-aFoundList[ i ];
mpBrowser-aFoundList.clear();
for( i = 0, nCount = aRemainingVector.size(); i nCount; ++i )
-mpBrowser-aFoundList.push_back( new String( aRemainingVector[ i ] ) );
+mpBrowser-aFoundList.push_back( aRemainingVector[ i ] );
aRemainingVector.clear();
@@ -812,9 +810,6 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties()
xMediaPlayer.clear();
xDialogListener.clear();
-for ( size_t i = 0, n = aFoundList.size(); i n; ++i )
-delete aFoundList[ i ];
-
for ( size_t i = 0, n = aFilterEntryList.size(); i n; ++i ) {
delete aFilterEntryList[ i ];
}
@@ -1011,10 +1006,7 @@ void TPGalleryThemeProperties::SearchFiles()
{
SearchProgress* pProgress = new SearchProgress( this, aURL );
-for ( size_t i = 0, n = aFoundList.size(); i n; ++i )
-delete aFoundList[ i ];
aFoundList.clear();
-
aLbxFound.Clear();
pProgress-SetFileType( aCbbFileType.GetText() );
@@ -1110,7 +1102,7 @@
Re: libreoffice beginner
Welcome Hamza, You can do like I did :) For code clean ups, and newcomer programmer level tasks, you can take a look at https://wiki.documentfoundation.org/Development/Easy_Hacks (is the wiki down BTW?) Other easy tasks for the UI are here: https://wiki.documentfoundation.org/Development/Default_UI_Improvements . You can also take a look at the Google Summer Of Code (Gsoc) on the wiki. To build libreoffice, you can take a look at https://wiki.documentfoundation.org/Development/Native_Build . I am not so sure about building on an eepc. The problem would be that building C++ code is _very_ slow and the eeepc has a very slow processor too. I'll let other comment on building on eeepc. You will find th wiki page for sending contributions through this one: http://www.documentfoundation.org/develop/ (Wiki seems down, so I cannot easily ensure this) Best of luck! Jean-Noël 2013/2/5 hamza abdelkebir cont...@hamza-abdelkebir.eu hi, I was at most of the libreoffice presentations at fosdem this year and I would like to help. I used the wiki to get the core code using git. - Where can I start if I would like to do some code clean up ? (to detect/remove dead code, useless comment...etc)? - how internationalization is done in the ui ? - is it possible to build and test libreoffice under a not so powerful machine like an eeepc? - what is the exact procedure to send ones modifications (do I have to use git to commit or send staff by email)? I know how to code in java but have no knowledge in python and some limited knowledge in ui coding with glade. thanks for your help :) Regards, Hamza ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: fdo#38838 - Removal/Replacement of the String/UniString with OUString once and for all.
Thanks for all your relevant answers and wiki updates.
I understand the goal is to replace String and its variants by OUString.
My last remaining question is what is the use of OString? Where/when is it
used in the application?
Thanks,
Jean-Noël
2013/1/15 Norbert Thiebaud nthieb...@gmail.com
On Tue, Jan 15, 2013 at 12:26 PM, Eike Rathke er...@redhat.com wrote:
For example, a
if (String.Search(...) == STRING_NOTFOUND)
replaced with
if (OUString.indexOf(...) == STRING_NOTFOUND)
will not work.
A even more tricky case is this:
String's functions usually deal silently with out-of-buffer
stituations, like asking to delete a part that overflow or even is
entirely outside a string.
and Search return as indicated above STRING_NOTFOUND that is 0x
i.e the max unsigned value of Xub_StrLen
so some code use this 'feature' to code something like:
pos=String.Search('#')
String.Erase(pos)
IOW: automated conversion is _not_ an option. String = OUString
convertion have to be carefully audited by hand, even if 99% of these
are trivial.
Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#38838 - Removal/Replacement of the String/UniString with OUString once and for all.
Hello, I have some questions about String/UniString removal. So far, I have replaced UniString with using OUString in a few places. The questions are: - What are the guidelines to replace String? When to use OString and when to use OUString? - What is XubString? https://wiki.documentfoundation.org/Development/String_Classes does not mention it. - What about the associated type xub_StrLen ? If somebody has got the answers, could he update https://wiki.documentfoundation.org/Development/String_Classes? Finally I noticed there is no doxygen generated for XubString, UniString or String under http://api.libreoffice.org/docs. Thanks, Jean-Noël ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: replacing OUString::valueOf(static_castsal_Int32) ??
2013/1/10 Lubos Lunak l.lu...@suse.cz Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. Sure, if you feel like writing one. Actually, I'd prefer to write a howto about that first, whenever I get to doing that, so that I don't have to write every single plugin. Such a plugin will be still much simpler than a regexp or any other way. Please do, I would be interested in that. Maybe you already have some URLs to share on this subject? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Writing new Clang plugins (Re: replacing OUString::valueOf(static_castsal_Int32) ??)
2013/1/11 Lubos Lunak l.lu...@suse.cz On Friday 11 of January 2013, Jean-Noël Rouvignac wrote: 2013/1/10 Lubos Lunak l.lu...@suse.cz Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. Sure, if you feel like writing one. Actually, I'd prefer to write a howto about that first, whenever I get to doing that, so that I don't have to write every single plugin. Such a plugin will be still much simpler than a regexp or any other way. Please do, I would be interested in that. Maybe you already have some URLs to share on this subject? That API is documented at http://clang.llvm.org/doxygen/ , but I understand that throwing that at somebody unfamiliar with it must be scaring (hint: the most commonly needed is the class hiearchy starting from clang::Stmt, as those are classes representing the program in the AST). I myself actually find it easier to read directly doxygen docs in the includes, mostly Decl*.h Expr*.h Stmt*.h in include/clang/AST/ . The API is however rather intuitive and straightforward, once one gets into it. And finding out how a particular piece of code is represented in the AST is a matter of compiling it with 'clang++ -Xclang -ast-dump' and matching the output to Clang classes. If you want to give it a try now, look under compilerplugins/ in the LO sources. I don't find this more intimidating than Eclipse's documentation for org.eclipse.cdt.core.dom.ast.cpp (Eclipse CDT's AST parser for C++) or org.eclipse.jdt.core.dom (Eclipse JDT's AST parser for Java). Only clang doc is harder to go through but it has nice graphics :). I might take a look at this. Thanks for sharing this info. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Bug 38838 - Removal/Replacement of the String/UniString with OUString once and for all.
2013/1/9 julien2412 serval2...@yahoo.fr Perhaps I missed it but I didn't find a license statement from you. Could you send a post with it? (you can take example from http://nabble.documentfoundation.org/License-Statement-td4027832.html) Hi Julien, I hereby declare that: All my contributions, past and future, to LibreOffice are licensed under the terms of the MPL / LGPLv3+. Thank you, Jean-Noel Rouvignac ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Bug 38838 - Removal/Replacement of the String/UniString with OUString once and for all.
I forgot to mention that there are a few strange cases that are doign the same that the old code was doing: The following code converts a sal_uIntPtr to sal_Int32: +OUString info = OUString::valueOf( static_castsal_Int32( pProgrInfo-GetCurObj() ) ) ++ OUString::valueOf( static_castsal_Int32( pProgrInfo-GetObjCount() ) ); +info = OUString::valueOf( static_castsal_Int32( pProgrInfo-GetCurAction() ) ) ++ OUString::valueOf( static_castsal_Int32( pProgrInfo-GetActionCount() ) ); +info = OUString::valueOf( static_castsal_Int32( pProgrInfo-GetCurInsert() ) ) ++ OUString::valueOf( static_castsal_Int32( pProgrInfo-GetInsertCount() ) ); The following code converts a sal_uInt32 to sal_Int32: +rText.Append( OUString::valueOf( static_castsal_Int32( nCount ) ) ); +rText.Append( OUString::valueOf( static_castsal_Int32( GetValue( i ).nValue ) ) ); I just converted the code to do what the old code was doing, but I find these dodgy. Should OUString be enhanced to support these types? Thanks, Jean-Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
