[Libreoffice-commits] .: 22 commits - basctl/source basic/source comphelper/inc comphelper/qa comphelper/source cui/source editeng/inc editeng/source filter/inc filter/source forms/source l10ntools/inc l10ntools/source lotuswordpro/Library_lwpft.mk lotuswordpro/source rsc/source sal/inc sc/source sd/source sfx2/inc sfx2/source solenv/bin solenv/gbuild sot/source stoc/prj stoc/source svl/source svtools/bmpmaker svtools/inc svtools/source svx/inc svx/source svx/workben sw/source tools/inc tools/source ucb/source unotools/inc unotools/source unusedcode.easy vcl/inc vcl/source vcl/unx writerfilter/source xmlhelp/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Aug 29 01:57:00 PDT 2011
basctl/source/basicide/baside2b.cxx | 2
basctl/source/basicide/bastypes.cxx | 29 -
basctl/source/inc/bastypes.hxx | 27 +
basic/source/app/app.cxx | 2
basic/source/app/brkpnts.cxx | 52 ---
basic/source/app/brkpnts.hxx | 5
comphelper/inc/comphelper/string.hxx | 102 +++++-
comphelper/qa/string/test_string.cxx | 45 ++
comphelper/source/misc/string.cxx | 45 ++
cui/source/options/optinet2.cxx | 4
editeng/inc/editeng/editeng.hxx | 4
editeng/inc/editeng/outliner.hxx | 1
editeng/source/editeng/editdbg.cxx | 69 ----
editeng/source/editeng/editdbg.hxx | 4
editeng/source/editeng/editdoc.cxx | 29 -
editeng/source/editeng/editdoc.hxx | 6
editeng/source/editeng/editeng.cxx | 21 -
editeng/source/outliner/outlvw.cxx | 10
filter/inc/filter/msfilter/svdfppt.hxx | 5
filter/source/msfilter/svdfppt.cxx | 37 --
forms/source/xforms/submission/serialization_urlencoded.cxx | 7
l10ntools/inc/cfgmerge.hxx | 1
l10ntools/source/cfgmerge.cxx | 6
l10ntools/source/gsicheck.cxx | 17 -
lotuswordpro/Library_lwpft.mk | 4
lotuswordpro/source/filter/bencont.cxx | 62 ---
lotuswordpro/source/filter/benobj.cxx | 47 --
lotuswordpro/source/filter/bento.hxx | 79 ----
lotuswordpro/source/filter/benval.cxx | 128 -------
lotuswordpro/source/filter/lwpdrawobj.cxx | 2
lotuswordpro/source/filter/lwpfilter.cxx | 1
lotuswordpro/source/filter/lwpoleobject.cxx | 1
lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx | 2
lotuswordpro/source/filter/lwpsdwrect.cxx | 8
lotuswordpro/source/filter/lwpsdwrect.hxx | 3
lotuswordpro/source/filter/tocread.cxx | 11
lotuswordpro/source/filter/tocread.hxx | 1
lotuswordpro/source/filter/utlist.cxx | 82 ----
lotuswordpro/source/filter/utlist.hxx | 6
lotuswordpro/source/filter/xfilter/xfcolumns.cxx | 23 -
lotuswordpro/source/filter/xfilter/xfcolumns.hxx | 16
lotuswordpro/source/filter/xfilter/xfdrawcircle.cxx | 133 --------
lotuswordpro/source/filter/xfilter/xfdrawcircle.hxx | 141 --------
lotuswordpro/source/filter/xfilter/xfdrawellipse.cxx | 116 -------
lotuswordpro/source/filter/xfilter/xfdrawellipse.hxx | 155 ---------
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 35 --
lotuswordpro/source/filter/xfilter/xfdrawpath.hxx | 2
lotuswordpro/source/filter/xfilter/xffileattrlist.hxx | 1
lotuswordpro/source/filter/xfilter/xffilestream.cxx | 197 ------------
lotuswordpro/source/filter/xfilter/xffilestream.hxx | 90 -----
lotuswordpro/source/filter/xfilter/xffloatframe.cxx | 6
lotuswordpro/source/filter/xfilter/xffloatframe.hxx | 1
lotuswordpro/source/filter/xfilter/xffontdecl.cxx | 18 -
lotuswordpro/source/filter/xfilter/xffontdecl.hxx | 14
lotuswordpro/source/filter/xfilter/xfglobal.cxx | 11
lotuswordpro/source/filter/xfilter/xfglobal.hxx | 10
lotuswordpro/source/filter/xfilter/xfindex.cxx | 56 ---
lotuswordpro/source/filter/xfilter/xfindex.hxx | 20 -
lotuswordpro/source/filter/xfilter/xfmargins.cxx | 2
lotuswordpro/source/filter/xfilter/xfmargins.hxx | 2
lotuswordpro/source/filter/xfilter/xfmasterpage.cxx | 11
lotuswordpro/source/filter/xfilter/xfmasterpage.hxx | 2
lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx | 10
lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx | 2
lotuswordpro/source/filter/xfilter/xfoleobj.cxx | 118 -------
lotuswordpro/source/filter/xfilter/xfoleobj.hxx | 87 -----
lotuswordpro/source/filter/xfilter/xfoutlinestyle.cxx | 21 -
lotuswordpro/source/filter/xfilter/xfoutlinestyle.hxx | 58 ---
lotuswordpro/source/filter/xfilter/xfparastyle.cxx | 12
lotuswordpro/source/filter/xfilter/xfparastyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfstylecont.cxx | 2
lotuswordpro/source/filter/xfilter/xfstylecont.hxx | 6
rsc/source/rsc/rsc.cxx | 2
sal/inc/sal/cppunit.h | 10
sc/source/core/tool/compiler.cxx | 3
sc/source/ui/app/inputhdl.cxx | 5
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/view/tabvwsh3.cxx | 2
sd/source/filter/ppt/pptin.cxx | 4
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 60 ---
sd/source/ui/docshell/docshel2.cxx | 11
sd/source/ui/inc/tpoption.hxx | 2
sfx2/inc/sfx2/frmdescr.hxx | 6
sfx2/inc/sfx2/imgmgr.hxx | 5
sfx2/inc/sfx2/objsh.hxx | 2
sfx2/inc/sfx2/progress.hxx | 3
sfx2/source/appl/appdde.cxx | 15
sfx2/source/bastyp/fltfnc.cxx | 10
sfx2/source/bastyp/progress.cxx | 58 ---
sfx2/source/dialog/filtergrouping.cxx | 10
sfx2/source/dialog/templdlg.cxx | 10
sfx2/source/doc/docfilt.cxx | 9
sfx2/source/doc/frmdescr.cxx | 25 -
sfx2/source/doc/objmisc.cxx | 11
sfx2/source/doc/objxtor.cxx | 6
sfx2/source/inc/templdgi.hxx | 1
sfx2/source/toolbox/imgmgr.cxx | 42 --
solenv/bin/callcatchEnv.Set.sh | 10
solenv/gbuild/platform/unxgcc.mk | 3
sot/source/sdstor/stgdir.cxx | 25 -
sot/source/sdstor/stgdir.hxx | 1
stoc/prj/build.lst | 2
stoc/source/uriproc/UriReferenceFactory.cxx | 41 --
svl/source/passwordcontainer/passwordcontainer.cxx | 11
svtools/bmpmaker/bmpcore.cxx | 2
svtools/inc/svtools/FilterConfigItem.hxx | 1
svtools/inc/svtools/editsyntaxhighlighter.hxx | 2
svtools/inc/svtools/wizdlg.hxx | 1
svtools/source/dialogs/filedlg2.cxx | 25 -
svtools/source/dialogs/wizdlg.cxx | 7
svtools/source/edit/editsyntaxhighlighter.cxx | 10
svtools/source/edit/syntaxhighlight.cxx | 24 -
svtools/source/filter/FilterConfigItem.cxx | 34 --
svtools/source/filter/sgvtext.cxx | 4
svtools/source/svhtml/parhtml.cxx | 8
svtools/source/svrtf/parrtf.cxx | 5
svx/inc/svx/dlgctrl.hxx | 11
svx/inc/svx/svdograf.hxx | 1
svx/source/dialog/dlgctrl.cxx | 116 -------
svx/source/sdr/properties/graphicproperties.cxx | 2
svx/source/svdraw/svdograf.cxx | 16
svx/workben/edittest.cxx | 30 -
sw/source/core/doc/docnum.cxx | 4
sw/source/filter/html/parcss1.cxx | 35 --
sw/source/ui/app/docsh2.cxx | 6
sw/source/ui/dbui/mmdocselectpage.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 3
sw/source/ui/misc/glosdoc.cxx | 7
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/uiview/srcview.cxx | 2
sw/source/ui/uno/unoatxt.cxx | 5
sw/source/ui/vba/vbatemplate.cxx | 7
tools/inc/tools/fsys.hxx | 3
tools/inc/tools/string.hxx | 8
tools/inc/tools/wldcrd.hxx | 61 +--
tools/source/fsys/dirent.cxx | 6
tools/source/fsys/fstat.cxx | 82 ----
tools/source/fsys/tdir.cxx | 8
tools/source/fsys/unx.cxx | 38 --
tools/source/fsys/wldcrd.cxx | 6
tools/source/inet/inetmsg.cxx | 2
tools/source/string/tstring.cxx | 87 -----
ucb/source/regexp/regexp.cxx | 17 -
unotools/inc/unotools/moduleoptions.hxx | 3
unotools/inc/unotools/startoptions.hxx | 16
unotools/source/config/moduleoptions.cxx | 42 --
unotools/source/config/startoptions.cxx | 37 --
unusedcode.easy | 136 --------
vcl/inc/unx/glyphcache.hxx | 1
vcl/inc/vcl/bitmapex.hxx | 3
vcl/inc/vcl/fixed.hxx | 2
vcl/inc/vcl/imgctrl.hxx | 3
vcl/source/control/fixed.cxx | 15
vcl/source/gdi/bitmapex.cxx | 7
vcl/unx/generic/glyphs/glyphcache.cxx | 14
writerfilter/source/filter/RtfFilter.cxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 6
xmlhelp/source/treeview/tvread.cxx | 4
160 files changed, 430 insertions(+), 3311 deletions(-)
New commits:
commit c5a15ea48c41e684001779da568e3ee31ddefdfe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 09:49:36 2011 +0100
cppunittester::LibreOfficeProtector/LibreOfficeProtecter confusion
diff --git a/sal/inc/sal/cppunit.h b/sal/inc/sal/cppunit.h
index 41c465d..0d085c2 100644
--- a/sal/inc/sal/cppunit.h
+++ b/sal/inc/sal/cppunit.h
@@ -37,16 +37,6 @@
#include <cppunit/plugin/TestPlugIn.h>
#include <cppunit/Protector.h>
-namespace cppunittester
-{
- class LibreOfficeProtecter : public CppUnit::Protector
- {
- public:
- virtual bool protect(CppUnit::Functor const & functor) = 0;
- using CppUnit::Protector::protect;
- };
-}
-
#undef CPPUNIT_PLUGIN_EXPORT
#define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
commit e56adc14dc736d19288ffb3f413238ba92f2df0a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 09:30:41 2011 +0100
use standard copy-ctor signatures, assignments, etc
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 8d2dbb1..3d1b734 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -186,8 +186,6 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/xfilter/xfdatestyle \
lotuswordpro/source/filter/xfilter/xfdocfield \
lotuswordpro/source/filter/xfilter/xfdrawareastyle \
- lotuswordpro/source/filter/xfilter/xfdrawcircle \
- lotuswordpro/source/filter/xfilter/xfdrawellipse \
lotuswordpro/source/filter/xfilter/xfdrawline \
lotuswordpro/source/filter/xfilter/xfdrawlinestyle \
lotuswordpro/source/filter/xfilter/xfdrawobj \
@@ -198,7 +196,6 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/xfilter/xfdrawstyle \
lotuswordpro/source/filter/xfilter/xfentry \
lotuswordpro/source/filter/xfilter/xffileattrlist \
- lotuswordpro/source/filter/xfilter/xffilestream \
lotuswordpro/source/filter/xfilter/xffloatframe \
lotuswordpro/source/filter/xfilter/xffont \
lotuswordpro/source/filter/xfilter/xffontdecl \
@@ -216,7 +213,6 @@ $(eval $(call gb_Library_add_exception_objects,lwpft,\
lotuswordpro/source/filter/xfilter/xfmasterpage \
lotuswordpro/source/filter/xfilter/xfnumberstyle \
lotuswordpro/source/filter/xfilter/xfofficemeta \
- lotuswordpro/source/filter/xfilter/xfoleobj \
lotuswordpro/source/filter/xfilter/xfoutlinestyle \
lotuswordpro/source/filter/xfilter/xfpagemaster \
lotuswordpro/source/filter/xfilter/xfparagraph \
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index b896bb2..7459902 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -79,8 +79,6 @@
#include "xfilter/xfdrawpath.hxx"
#include "xfilter/xfdrawline.hxx"
#include "xfilter/xfdrawpolygon.hxx"
-#include "xfilter/xfdrawellipse.hxx"
-#include "xfilter/xfdrawcircle.hxx"
#include "xfilter/xfimage.hxx"
#include "lwpcharsetmgr.hxx"
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 4533222..f28493a 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -61,7 +61,6 @@
#include "lwpresource.hxx"
//for sax stream
#include "xfilter/xfsaxstream.hxx"
-#include "xfilter/xffilestream.hxx"
//for file parser
#include "lwp9reader.hxx"
#include "lwpsvstream.hxx"
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx
index 07e5586..c818118 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -68,7 +68,6 @@
#include "lwpobjfactory.hxx"
#include "lwpidxmgr.hxx"
#include "lwp9reader.hxx"
-#include "xfilter/xfoleobj.hxx"
#include "xfilter/xfparagraph.hxx"
#include "lwpframelayout.hxx"
#include "xfilter/xfstylemanager.hxx"
diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
index 044db9d..7e912aa 100644
--- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
+++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx
@@ -70,10 +70,8 @@
#include "xfilter/xfdrawpath.hxx"
#include "xfilter/xfdrawpolyline.hxx"
#include "xfilter/xfdrawrect.hxx"
-#include "xfilter/xfdrawellipse.hxx"
#include "xfilter/xfdrawpolygon.hxx"
#include "xfilter/xfdrawgroup.hxx"
-#include "xfilter/xfdrawcircle.hxx"
#include "xfilter/xfdrawstyle.hxx"
#include "xfilter/xfdrawlinestyle.hxx"
#include "xfilter/xfparagraph.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
index 56adf5e..058a8ec 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.cxx
@@ -64,26 +64,12 @@ void XFColumn::SetRelWidth(sal_Int32 width)
m_nRelWidth = width;
}
-sal_Int32 XFColumn::GetRelWidth()
-{
- return m_nRelWidth;
-}
-
void XFColumn::SetMargins(double left, double right)
{
m_fMarginLeft = left;
m_fMarginRight = right;
}
-double XFColumn::GetMarginLeft()
-{
- return m_fMarginLeft;
-}
-double XFColumn::GetMarginRight()
-{
- return m_fMarginRight;
-}
-
void XFColumn::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
@@ -142,15 +128,6 @@ void XFColumnSep::ToXml(IXFStream *pStrm)
pStrm->EndElement( A2OUSTR("style:column-sep") );
}
-void XFColumns::SetSeperator(sal_Int32 height, double /*width*/, XFColor color,enumXFAlignType align)
-{
- m_aSeperator.SetRelHeight(height);
- m_aSeperator.SetWidth(0.1);
- m_aSeperator.SetColor(color);
- m_aSeperator.SetVerticalAlign(align);
- m_nFlag |= XFCOLUMNS_FLAG_SEPERATOR;
-}
-
void XFColumns::SetSeperator(XFColumnSep& aSeperator)
{
m_aSeperator = aSeperator;
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
index d816c0c..80e7e94 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
@@ -87,26 +87,11 @@ public:
void SetRelWidth(sal_Int32 width);
/**
- * @descr return column relative width.
- */
- sal_Int32 GetRelWidth();
-
- /**
* @descr Set column margin left and margin right.
*/
void SetMargins(double left, double right);
/**
- * @descr return column left margin.
- */
- double GetMarginLeft();
-
- /**
- * @descr return column right margin.
- */
- double GetMarginRight();
-
- /**
* @descr output column style as an xml node.
*/
virtual void ToXml(IXFStream *pStrm);
@@ -157,7 +142,6 @@ public:
m_fGap = 0;
}
public:
- void SetSeperator(sal_Int32 height, double width, XFColor color = XFColor(0,0,0),enumXFAlignType align = enumXFAlignMiddle);
void SetSeperator(XFColumnSep& aSeperator);
void SetGap(double fGap);
void SetCount(sal_uInt16 nCount);
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawcircle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawcircle.cxx
deleted file mode 100644
index 6faaa06..0000000
--- a/lotuswordpro/source/filter/xfilter/xfdrawcircle.cxx
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Circle object.
- ************************************************************************/
-#include "xfdrawcircle.hxx"
-#include <math.h>
-#include <cstdlib>
-
-XFDrawCircle::XFDrawCircle()
-{
- m_fRadius = 0;
- m_fStartAngle = 0;
- m_fEndAngle = 360;
- m_eDrawKind = enumXFDrawKindFull;
- m_bUseAngle = sal_False;
-}
-
-XFDrawCircle::XFDrawCircle(XFPoint pt, double radius)
-{
- m_aCenterPoint = pt;
- m_fRadius = radius;
- m_fStartAngle = 0;
- m_fEndAngle = 360;
- m_eDrawKind = enumXFDrawKindFull;
- m_bUseAngle = sal_False;
-}
-
-void XFDrawCircle::ToXml(IXFStream *pStrm)
-{
- IXFAttrList *pAttrList = pStrm->GetAttrList();
-
- pAttrList->Clear();
- if( m_bUseAngle )
- {
- double x1 = m_aCenterPoint.GetX() + m_fRadius*cos(m_fStartAngle*2*PI/360);
- double x2 = m_aCenterPoint.GetX() + m_fRadius*cos(m_fEndAngle*2*PI/360);
- double y1 = m_aCenterPoint.GetY() + m_fRadius*sin(m_fStartAngle*2*PI/360);
- double y2 = m_aCenterPoint.GetY() + m_fRadius*sin(m_fEndAngle*2*PI/360);
- double width;
- double height;
-
- double x11 = MIN3(m_aCenterPoint.GetX()-m_fRadius,x1,x2);
- double x12 = MAX3(m_aCenterPoint.GetX()+m_fRadius,x1,x2);
- double y11 = MIN3(m_aCenterPoint.GetY()-m_fRadius,y1,y2);
- double y12 = MAX3(m_aCenterPoint.GetY()+m_fRadius,y1,y2);
- width = x12-x11;
- height = y12-y11;
-
- if (width > FLOAT_MIN || height > FLOAT_MIN)
- {
- SetPosition(x11,y11,width,height);
- }
-
- //
- pAttrList->AddAttribute( A2OUSTR("draw:kind"), GetDrawKind(m_eDrawKind) );
- pAttrList->AddAttribute( A2OUSTR("draw:start-angle"), DoubleToOUString(m_fStartAngle) );
- pAttrList->AddAttribute( A2OUSTR("draw:end-angle"), DoubleToOUString(m_fEndAngle) );
- }
- else
- {
- double x = m_aCenterPoint.GetX() - m_fRadius;
- double y = m_aCenterPoint.GetY() - m_fRadius;
- double width = m_fRadius*2;
- double height = m_fRadius*2;
- if (width > FLOAT_MIN || height > FLOAT_MIN)
- {
- SetPosition(x,y,width,height);
- }
- }
-
- XFDrawObject::ToXml(pStrm);
-
- pStrm->StartElement( A2OUSTR("draw:circle") );
- ContentToXml(pStrm);
- pStrm->EndElement( A2OUSTR("draw:circle") );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawcircle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawcircle.hxx
deleted file mode 100644
index 8440e7f..0000000
--- a/lotuswordpro/source/filter/xfilter/xfdrawcircle.hxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Circle object.
- ************************************************************************/
-#ifndef _XFDRAWCIRCLE_HXX
-#define _XFDRAWCIRCLE_HXX
-
-#include "xfdrawobj.hxx"
-
-/**
- * @brief
- * Circle object.
- */
-class XFDrawCircle : public XFDrawObject
-{
-public:
- XFDrawCircle();
-
- XFDrawCircle(XFPoint pt, double radius);
-
-public:
- /**
- * @descr Set the center point for the circle.
- */
- void SetCenterPoint(double x, double y);
-
- /**
- * @descr Set the center point for the circle
- */
- void SetCenterPoint(XFPoint pt);
-
- /**
- * @descr
- */
- void SetRadius(double radius);
-
- void SetAngle(double start, double end);
-
- void SetDrawKind(enumXFDrawKind kind);
-
- virtual void ToXml(IXFStream *pStrm);
-
-private:
- XFPoint m_aCenterPoint;
- double m_fRadius;
- double m_fStartAngle;
- double m_fEndAngle;
- enumXFDrawKind m_eDrawKind;
- sal_Bool m_bUseAngle;
-};
-
-inline void XFDrawCircle::SetCenterPoint(double x, double y)
-{
- m_aCenterPoint = XFPoint(x,y);
-}
-
-inline void XFDrawCircle::SetCenterPoint(XFPoint pt)
-{
- m_aCenterPoint = pt;
-}
-
-inline void XFDrawCircle::SetRadius(double radius)
-{
- m_fRadius = radius;
-}
-
-inline void XFDrawCircle::SetAngle(double start, double end)
-{
- assert(start>=0&&start<=360);
- assert(end>=0&&end<=360);
- m_fStartAngle = start;
- m_fEndAngle = end;
-
- m_bUseAngle = sal_True;
- m_eDrawKind = enumXFDrawKindCut;
-}
-
-inline void XFDrawCircle::SetDrawKind(enumXFDrawKind kind)
-{
- m_eDrawKind = kind;
-}
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawellipse.cxx b/lotuswordpro/source/filter/xfilter/xfdrawellipse.cxx
deleted file mode 100644
index 74b09d9..0000000
--- a/lotuswordpro/source/filter/xfilter/xfdrawellipse.cxx
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Eclipse object.
- ************************************************************************/
-#include "xfdrawellipse.hxx"
-#include <cmath>
-
-XFDrawEllipse::XFDrawEllipse()
-{
- m_fRadiusX = 0;
- m_fRadiusY = 0;
- m_fStartAngle = 0;
- m_fEndAngle = 360;
- m_eDrawKind = enumXFDrawKindFull;
- m_bUseAngle = sal_False;
-}
-
-void XFDrawEllipse::ToXml(IXFStream *pStrm)
-{
- IXFAttrList *pAttrList = pStrm->GetAttrList();
-
- pAttrList->Clear();
- //not support yet.
- if( m_bUseAngle )
- {
- double x1 = m_aCenterPoint.GetX() + m_fRadiusX*cos(m_fStartAngle*2*PI/360);
- double x2 = m_aCenterPoint.GetX() + m_fRadiusX*cos(m_fEndAngle*2*PI/360);
- double y1 = m_aCenterPoint.GetY() + m_fRadiusY*sin(m_fStartAngle*2*PI/360);
- double y2 = m_aCenterPoint.GetY() + m_fRadiusY*sin(m_fEndAngle*2*PI/360);
- double width;
- double height;
-
- double x11 = MIN3(m_aCenterPoint.GetX()-m_fRadiusX,x1,x2);
- double x12 = MAX3(m_aCenterPoint.GetX()+m_fRadiusX,x1,x2);
- double y11 = MIN3(m_aCenterPoint.GetY()-m_fRadiusY,y1,y2);
- double y12 = MAX3(m_aCenterPoint.GetY()+m_fRadiusY,y1,y2);
- width = x12-x11;
- height = y12-y11;
- SetPosition(x11,y11,width,height);
-
- //
- pAttrList->AddAttribute( A2OUSTR("draw:kind"), GetDrawKind(m_eDrawKind) );
- pAttrList->AddAttribute( A2OUSTR("draw:start-angle"), DoubleToOUString(m_fStartAngle) );
- pAttrList->AddAttribute( A2OUSTR("draw:end-angle"), DoubleToOUString(m_fEndAngle) );
- }
- else
- {
- double x = m_aCenterPoint.GetX() - m_fRadiusX;
- double y = m_aCenterPoint.GetY() - m_fRadiusY;
- double width = m_fRadiusX*2;
- double height = m_fRadiusY*2;
- SetPosition(x,y,width,height);
- }
-
- XFDrawObject::ToXml(pStrm);
-
- pStrm->StartElement( A2OUSTR("draw:ellipse") );
- ContentToXml(pStrm);
- pStrm->EndElement( A2OUSTR("draw:ellipse") );
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawellipse.hxx b/lotuswordpro/source/filter/xfilter/xfdrawellipse.hxx
deleted file mode 100644
index b3280f0..0000000
--- a/lotuswordpro/source/filter/xfilter/xfdrawellipse.hxx
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Eclipse object.
- ************************************************************************/
-#ifndef _XFDRAWELLIPSE_HXX
-#define _XFDRAWELLIPSE_HXX
-
-#include "xfdrawobj.hxx"
-
-/**
- * @brief
- * Ellipse obejct for drawing layer.
- * You can set Ellipse position by setting it's center point and radius or calling XFDrawEllipse::SetPosition function.
- * If you using the first method,i'll calc the real position.
- *
- * You can draw part of an ellipse by using SetAngle(), for example, use SetaAngle(0,180) to draw half a ellipse.
- * When draw part of an ellipse, you can use SetDrawKind() to decide which kind of object to draw, an arch, a section,
- * or a cut.
- */
-class XFDrawEllipse : public XFDrawObject
-{
-public:
- XFDrawEllipse();
-
-public:
- /**
- * @descr Set ellipse center point.
- */
- void SetCenterPoint(double x, double y);
-
- /**
- * @descr Set ellipse center point.
- */
- void SetCenterPoint(XFPoint pt);
-
- /**
- * @descr Set ellipse radius.
- */
- void SetRadius(double radiusX, double radiusY);
-
- /**
- * @descr If only draw part of the ellipse, set the start angle and end angle.
- */
- void SetAngle(double start, double end);
-
- /**
- * @descr Set ellipse draw type,please refer to enumXFDrawKind.
- */
- void SetDrawKind(enumXFDrawKind kind);
-
- /**
- * @descr Output ellipse obejct.
- */
- virtual void ToXml(IXFStream *pStrm);
-
-private:
- XFPoint m_aCenterPoint;
- double m_fRadiusX;
- double m_fRadiusY;
- double m_fStartAngle;
- double m_fEndAngle;
- enumXFDrawKind m_eDrawKind;
- sal_Bool m_bUseAngle;
-};
-
-inline void XFDrawEllipse::SetCenterPoint(double x, double y)
-{
- m_aCenterPoint = XFPoint(x,y);
-}
-
-inline void XFDrawEllipse::SetCenterPoint(XFPoint pt)
-{
- m_aCenterPoint = pt;
-}
-
-inline void XFDrawEllipse::SetRadius(double radiusX, double radiusY)
-{
- m_fRadiusX = radiusX;
- m_fRadiusY = radiusY;
-}
-
-inline void XFDrawEllipse::SetAngle(double start, double end)
-{
- assert(start>=0&&start<=360);
- assert(end>=0&&end<=360);
-
- m_fStartAngle = start;
- m_fEndAngle = end;
- m_bUseAngle = sal_True;
- m_eDrawKind = enumXFDrawKindCut;
-}
-
-inline void XFDrawEllipse::SetDrawKind(enumXFDrawKind kind)
-{
- m_eDrawKind = kind;
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index 468c145..2d518a9 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -169,39 +169,4 @@ void XFDrawPath::ToXml(IXFStream *pStrm)
pStrm->EndElement( A2OUSTR("draw:path") );
}
-
-XFRect XFDrawPath::CalcViewBox()
-{
- double x1 = 65536;
- double y1 = 65536;
- double x2 = -1; //not quite safe.()
- double y2 = -1;
- XFSvgPathEntry aPath;
- XFPoint aPoint;
- std::vector<XFSvgPathEntry>::iterator itPath = m_aPaths.begin();
- std::vector<XFPoint> points;
- std::vector<XFPoint>::iterator itPoint;
- do{
- aPath = *itPath;
- points = aPath.m_aPoints;
-
- for( itPoint = points.begin(); itPoint != points.end(); ++itPoint )
- {
- aPoint = *itPoint;
- if( x1>aPoint.GetX() )
- x1 = aPoint.GetX();
- if( x2<aPoint.GetX() )
- x2 = aPoint.GetX();
-
- if( y1>aPoint.GetY() )
- y1 = aPoint.GetY();
- if( y2<aPoint.GetY() )
- y2 = aPoint.GetY();
- }
- ++itPath;
- }while(itPath!=m_aPaths.end());
-
- return XFRect(x1,y1,x2-x1,y2-y1);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
index 1795025..71d55f1 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx
@@ -123,8 +123,6 @@ public:
*/
void ClosePath(sal_Bool absPosition = sal_True);
- XFRect CalcViewBox();
-
virtual void ToXml(IXFStream *pStrm);
private:
diff --git a/lotuswordpro/source/filter/xfilter/xffileattrlist.hxx b/lotuswordpro/source/filter/xfilter/xffileattrlist.hxx
index 2ebc408..ce6f45c 100644
--- a/lotuswordpro/source/filter/xfilter/xffileattrlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffileattrlist.hxx
@@ -76,7 +76,6 @@ public:
virtual void AddAttribute(const rtl::OUString& name, const rtl::OUString& value);
virtual void Clear();
- friend class XFFileStream;
private:
std::vector<std::pair<rtl::OUString,rtl::OUString> > m_aAttrList;
diff --git a/lotuswordpro/source/filter/xfilter/xffilestream.cxx b/lotuswordpro/source/filter/xfilter/xffilestream.cxx
deleted file mode 100644
index 9cba19a..0000000
--- a/lotuswordpro/source/filter/xfilter/xffilestream.cxx
+++ /dev/null
@@ -1,197 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Interface for the all content object,ie. text,paragraph,picture,and so on.
- ************************************************************************/
-#include "xffilestream.hxx"
-#include "xffileattrlist.hxx"
-#include "ixfattrlist.hxx"
-
-void WriteEndTag(std::ofstream& ofs, const char *pStr, int len);
-void WriteString(std::ofstream& ofs, const char *pStr, int len);
-void WriteXmlString(std::ofstream& ofs, const char *pStr, int len);
-void WriteOUString(std::ofstream& ofs, const rtl::OUString& oustr);
-
-XFFileStream::XFFileStream(std::string strFileName):m_aFile(strFileName.c_str())
-{
- m_pAttrList = new XFFileAttrList();
-}
-
-XFFileStream::~XFFileStream()
-{
- if( m_pAttrList )
- delete m_pAttrList;
-}
-
-void XFFileStream::StartDocument()
-{
- std::string strXmlDecl = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
- WriteString(m_aFile, strXmlDecl.c_str(),strXmlDecl.length());
-}
-
-void XFFileStream::EndDocument()
-{
- m_aFile.close();
-}
-
-
-void XFFileStream::StartElement(const rtl::OUString& oustr)
-{
- WriteString(m_aFile, "\n<",2);
- WriteOUString(m_aFile, oustr);
-
- //write attributes:
- std::vector<std::pair<rtl::OUString,rtl::OUString> >::iterator it;
- for( it = m_pAttrList->m_aAttrList.begin(); it != m_pAttrList->m_aAttrList.end(); ++it )
- {
- std::pair<rtl::OUString,rtl::OUString> pair = *it;
- rtl::OUString name = pair.first;
- rtl::OUString value = pair.second;
-
- WriteString(m_aFile," ",1);
- WriteOUString(m_aFile, name);
- WriteString(m_aFile, "=\"",2);
- WriteOUString(m_aFile, value);
- WriteString(m_aFile, "\"",1);
-
- }
-
- WriteString(m_aFile, ">",1);
- m_pAttrList->Clear();
-}
-
-void XFFileStream::EndElement(const rtl::OUString& oustr)
-{
- rtl::OString ostr;
-
- ostr = rtl::OUStringToOString(oustr,RTL_TEXTENCODING_UTF8);
- WriteEndTag(m_aFile, ostr.getStr(), ostr.getLength());
-}
-
-void XFFileStream::Characters(const rtl::OUString& oustr)
-{
- WriteOUString(m_aFile, oustr);
-}
-
-IXFAttrList* XFFileStream::GetAttrList()
-{
- return m_pAttrList;
-}
-
-void WriteEndTag(std::ofstream& ofs, const char *pStr, int len)
-{
- ofs.write("</",2);
- ofs.write(pStr,len);
- ofs.write(">\n",2);
-}
-
-void WriteString(std::ofstream& ofs, const char *pStr, int len)
-{
- ofs.write(pStr,len);
-}
-
-/**
- * @descr: Replace some reserved characters of xml character into xml entity.Please refer to w3c xml spec.
- */
-void WriteXmlString(std::ofstream& ofs, const char *pStr, int len)
-{
- std::string str;
-
- for( int i=0; i<len; i++ )
- {
- switch(pStr[i])
- {
- case '&':
- str += "&";
- break;
- case '<':
- str += "<";
- break;
- case '>':
- str += ">";
- break;
- case '\'':
- str += "'";
- break;
- case '\"':
- str += """;
- break;
- case 13:
- str += "
";
- break;
- case 10:
- str += "
";
- break;
- case 9:
- str += "	";
- break;
- default:
- str += pStr[i];
- }
- }
- ofs.write(str.c_str(),str.length());
-}
-
-void WriteOUString(std::ofstream& ofs, const rtl::OUString& oustr)
-{
- rtl::OString ostr;
-
- ostr = rtl::OUStringToOString(oustr,RTL_TEXTENCODING_UTF8);
-
- WriteXmlString(ofs, ostr.getStr(),ostr.getLength());
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xffilestream.hxx b/lotuswordpro/source/filter/xfilter/xffilestream.hxx
deleted file mode 100644
index 3cf9541..0000000
--- a/lotuswordpro/source/filter/xfilter/xffilestream.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/*************************************************************************
- * @file
- * Wrapper for sax stream to write to local file.
- ************************************************************************/
-#ifndef _XFFILESTREAM_HXX
-#define _XFFILESTREAM_HXX
-
-#include "ixfstream.hxx"
-#include <fstream>
-#include <rtl/ustring.hxx>
-
-class XFFileAttrList;
-
-class XFFileStream : public IXFStream
-{
-public:
- XFFileStream(std::string strFileName);
- virtual ~XFFileStream();
-
- //interface IXFSaxStream
- virtual void StartDocument();
- virtual void EndDocument();
- virtual void StartElement(const rtl::OUString& oustr);
- virtual void EndElement(const rtl::OUString& oustr);
- virtual void Characters(const rtl::OUString& oustr);
- virtual IXFAttrList* GetAttrList();
-
-private:
- std::ofstream m_aFile;
- XFFileAttrList *m_pAttrList;
-};
-
-#endif //XFFILESTREAM_INC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
index 13af6f0..861ebcc 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.cxx
@@ -59,12 +59,6 @@
************************************************************************/
#include "xffloatframe.hxx"
-XFFloatFrame::XFFloatFrame(sal_Int32 page)
-{
- m_nStart = page;
- m_nEnd = page;
-}
-
XFFloatFrame::XFFloatFrame(sal_Int32 start, sal_Int32 end, sal_Bool all)
{
m_nStart = start;
diff --git a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
index b8f19d3..bae7a49 100644
--- a/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffloatframe.hxx
@@ -71,7 +71,6 @@
class XFFloatFrame : public XFFrame
{
public:
- XFFloatFrame(sal_Int32 page);
/**
* @descr output range: [start,end], not [start,end).
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
index 21dafaa..3f4abcc 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.cxx
@@ -59,10 +59,6 @@
************************************************************************/
#include "xffontdecl.hxx"
-XFFontDecl::XFFontDecl()
-{
-}
-
XFFontDecl::XFFontDecl(rtl::OUString name, rtl::OUString family, sal_Bool fixed)
{
m_strFontName = name;
@@ -75,28 +71,14 @@ rtl::OUString XFFontDecl::GetFontName()
return m_strFontName;
}
-void XFFontDecl::SetFontName(rtl::OUString name)
-{
- m_strFontName = name;
-}
-
rtl::OUString XFFontDecl::GetFontFamily()
{
return m_strFontFamily;
}
-void XFFontDecl::SetFontFamily(rtl::OUString family)
-{
- m_strFontFamily = family;
-}
-
sal_Bool XFFontDecl::GetFontPitchFixed()
{
return m_bPitchFixed;
}
-void XFFontDecl::SetFontPitchFixed(sal_Bool fixed)
-{
- m_bPitchFixed = fixed;
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
index 26ef2d8..2d299c4 100644
--- a/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
+++ b/lotuswordpro/source/filter/xfilter/xffontdecl.hxx
@@ -71,8 +71,6 @@
class XFFontDecl
{
public:
- XFFontDecl();
-
XFFontDecl(rtl::OUString name, rtl::OUString family, sal_Bool fixed = false);
public:
@@ -82,24 +80,12 @@ public:
rtl::OUString GetFontName();
/**
- * @descr Set font name.
- */
- void SetFontName(rtl::OUString name);
-
- /**
* @descr Get font family.
*/
rtl::OUString GetFontFamily();
- /**
- * @descr Set font famuly.
- */
- void SetFontFamily(rtl::OUString family);
-
sal_Bool GetFontPitchFixed();
- void SetFontPitchFixed(sal_Bool fixed);
-
private:
rtl::OUString m_strFontName;
rtl::OUString m_strFontFamily;
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.cxx b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
index ee0bb97..773ddf4 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.cxx
@@ -87,17 +87,6 @@ rtl::OUString XFGlobal::GenFrameName()
return A2OUSTR("frame") + Int32ToOUString(s_nFrameID++);
}
-rtl::OUString XFGlobal::GenGraphName()
-{
- return A2OUSTR("gr") + Int32ToOUString(s_nGraphID++);
-}
-
-//For chart object, /2005/2
-rtl::OUString XFGlobal::GenObjName()
-{
- return A2OUSTR("Object") + Int32ToOUString(s_nObjID++);
-}
-
rtl::OUString XFGlobal::GenTableName()
{
return A2OUSTR("table") + Int32ToOUString(s_nFrameID++);
diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
index f758b86..33b8714 100644
--- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfglobal.hxx
@@ -121,11 +121,6 @@ public:
static rtl::OUString GenFrameName();
/**
- * @descr Generate a name for graphics.
- */
- static rtl::OUString GenGraphName();
-
- /**
* @descr Generate a name for a table.
*/
static rtl::OUString GenTableName();
@@ -146,11 +141,6 @@ public:
static rtl::OUString GenAreaName();
/**
- * @descr Generate a name for a ole obejct.
- */
- static rtl::OUString GenObjName();
-
- /**
* @descr Generate a name for an image object
*/
static rtl::OUString GenImageName();
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx
index fe64ee5..8c1ab7b 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx
@@ -92,20 +92,6 @@ XFIndex::~XFIndex()
}
}
-void XFIndex::SetSectionStyle(rtl::OUString strSectStyleName)
-{
- SetStyleName(strSectStyleName);
-}
-
-void XFIndex::SetTitle(rtl::OUString title, rtl::OUString strParaStyle)
-{
- m_strTitle = title;
-
- m_pTitle = new XFParagraph();
- m_pTitle->SetStyleName(strParaStyle);
- m_pTitle->Add(m_strTitle);
-}
-
void XFIndex::AddTemplate(sal_uInt32 level,
rtl::OUString /*style*/,
enumXFIndexTemplate type1,
@@ -155,11 +141,6 @@ void XFIndex::AddEntry(rtl::OUString entry, rtl::OUString strParaStyle)
XFContentContainer::Add(pPara);
}
-sal_Int32 XFIndex::GetEntryCount()
-{
- return GetCount();
-}
-
void XFIndex::SetProtected(sal_Bool protect)
{
m_bProtect = protect;
@@ -180,43 +161,6 @@ void XFIndex::AddTocSource(sal_uInt16 nLevel, const rtl::OUString sStyleName)
m_aTOCSource[nLevel].push_back(sStyleName);
}
-void XFIndex::SetDefaultAlphaIndex(rtl::OUString /*strDivision*/,sal_Bool bRunin, sal_Bool bSeparator)
-{
- XFIndexTemplate * pTemplateSep = new XFIndexTemplate();
- if (bSeparator)
- {
- SetSeparator(sal_True);
- pTemplateSep->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
- }
- AddTemplate(A2OUSTR("separator"),A2OUSTR("Separator"),pTemplateSep);
-
- XFIndexTemplate * pTemplate1 = new XFIndexTemplate();
- pTemplate1->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
- pTemplate1->AddEntry(enumXFIndexTemplateTab,A2OUSTR(""));
- pTemplate1->AddEntry(enumXFIndexTemplatePage,A2OUSTR(""));
- AddTemplate(Int32ToOUString(1),A2OUSTR("Primary"),pTemplate1);
-
- XFIndexTemplate * pTemplate2 = new XFIndexTemplate();
- pTemplate2->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
- pTemplate2->AddEntry(enumXFIndexTemplateTab,A2OUSTR(""));
- pTemplate2->AddEntry(enumXFIndexTemplatePage,A2OUSTR(""));
- XFIndexTemplate * pTemplate3 = new XFIndexTemplate();
- pTemplate3->AddEntry(enumXFIndexTemplateText,A2OUSTR(""));
- pTemplate3->AddEntry(enumXFIndexTemplateTab,A2OUSTR(""));
- pTemplate3->AddEntry(enumXFIndexTemplatePage,A2OUSTR(""));
-
- if (bRunin)
- {
- AddTemplate(Int32ToOUString(2),A2OUSTR("Primary"),pTemplate2);
- AddTemplate(Int32ToOUString(3),A2OUSTR("Primary"),pTemplate3);
- }
- else
- {
- AddTemplate(Int32ToOUString(2),A2OUSTR("Secondary"),pTemplate2);
- AddTemplate(Int32ToOUString(3),A2OUSTR("Secondary"),pTemplate3);
- }
-}
-
void XFIndex::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx
index 2306181..04708bd 100644
--- a/lotuswordpro/source/filter/xfilter/xfindex.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx
@@ -152,16 +152,6 @@ public:
void SetIndexType(enumXFIndex type);
/**
- * @descr Set index section style. Perhaps you should create a section style first.
- */
- void SetSectionStyle(rtl::OUString strSectStyleName);
-
- /**
- * @descr Set index title.
- */
- void SetTitle(rtl::OUString title, rtl::OUString strParaStyle);
-
- /**
* @descr Set index entry template.
* @param level [1-10].
*/
@@ -183,11 +173,6 @@ public:
void AddEntry(rtl::OUString entry, rtl::OUString strParaStyle);
/**
- * @descr return entry count.
- */
- sal_Int32 GetEntryCount();
-
- /**
* @descr Set if protected index to prevent handly-revise.
*/
void SetProtected(sal_Bool protect);
@@ -201,11 +186,6 @@ public:
void AddTocSource(sal_uInt16 nLevel, const rtl::OUString sStyleName);
- /**
- * @descr Set default value for index.
- */
- void SetDefaultAlphaIndex(rtl::OUString strDivision,sal_Bool bRunin, sal_Bool bSeparator);
-
private:
enumXFIndex m_eType;
rtl::OUString m_strTitle;
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.cxx b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
index 16624a7..603b0ac 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.cxx
@@ -114,7 +114,7 @@ bool operator!=(XFMargins& indent1, XFMargins& indent2)
return !(indent1==indent2);
}
-XFMargins& XFMargins::operator=(XFMargins& other)
+XFMargins& XFMargins::operator=(const XFMargins& other)
{
m_nFlag = other.m_nFlag;
m_fLeft = other.m_fLeft;
diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
index 45f85d7..dd88b7a 100644
--- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmargins.hxx
@@ -88,7 +88,7 @@ public:
friend bool operator==(XFMargins& indent1, XFMargins& indent2);
friend bool operator!=(XFMargins& indent1, XFMargins& indent2);
- XFMargins& operator=(XFMargins& other);
+ XFMargins& operator=(const XFMargins& other);
private:
double m_fLeft;
double m_fRight;
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
index b429fa4..6318c41 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx
@@ -102,17 +102,6 @@ void XFMasterPage::SetPageMaster(rtl::OUString pm)
m_strPageMaster = pm;
}
-void XFMasterPage::SetPageMaster(XFPageMaster *pPM)
-{
- if( pPM->GetStyleName().getLength() > 0 )
- m_strPageMaster = pPM->GetStyleName();
- else
- {
- XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
- m_strPageMaster = pXFStyleManager->AddStyle(pPM)->GetStyleName();
- }
-}
-
void XFMasterPage::ToXml(IXFStream *pStrm)
{
IXFAttrList *pAttrList = pStrm->GetAttrList();
diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
index b7ffacf..e238584 100644
--- a/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.hxx
@@ -76,8 +76,6 @@ public:
public:
void SetPageMaster(rtl::OUString pm);
- void SetPageMaster(XFPageMaster *pPM);
-
void SetHeader(XFHeader *pHeader);
void SetFooter(XFFooter *pFooter);
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
index 1b5512f..354dc0e 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx
@@ -70,16 +70,6 @@ XFNumberStyle::XFNumberStyle():m_aColor(0,0,0),m_aNegativeColor(255,0,0)
m_bCurrencySymbolPost = sal_False;
}
-XFNumberStyle::XFNumberStyle(enumXFNumberType type)
-{
- m_eType = type;
- m_nDecimalDigits = 0;
- m_nMinInteger = 1;
- m_nMinExponent = 1;
- m_bRedIfNegative = sal_False;
- m_bCurrencySymbolPost = sal_False;
-}
-
enumXFStyle XFNumberStyle::GetStyleFamily()
{
return enumXFStyleNumber;
diff --git a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
index d39393e..d261855 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumberstyle.hxx
@@ -70,8 +70,6 @@ class XFNumberStyle : public XFStyle
public:
XFNumberStyle();
- XFNumberStyle(enumXFNumberType type );
-
public:
void SetDecimalDigits(sal_Int32 decimal);
diff --git a/lotuswordpro/source/filter/xfilter/xfoleobj.cxx b/lotuswordpro/source/filter/xfilter/xfoleobj.cxx
deleted file mode 100644
index dcd36af..0000000
--- a/lotuswordpro/source/filter/xfilter/xfoleobj.cxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#include "xfoleobj.hxx"
-#include "xfbase64.hxx"
-
-XFOleObject::XFOleObject()
-{
-}
-
-void XFOleObject::SetOleData(sal_uInt8 *buf, int len)
-{
- m_strData = XFBase64::Encode(buf, len);
-}
-
-void XFOleObject::ToXml(IXFStream *pStrm)
-{
- IXFAttrList *pAttrList = pStrm->GetAttrList();
-
- if( GetStyleName().getLength() )
- pAttrList->AddAttribute( A2OUSTR("draw:style-name"), GetStyleName() );
-
- assert(m_strName.getLength()>0); //name should not be null.
- if( m_strName.getLength() )
- pAttrList->AddAttribute( A2OUSTR("draw:name"), m_strName );
- //anchor type:
- switch( m_eAnchor )
- {
- case enumXFAnchorPara:
- pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("paragraph") );
- break;
- case enumXFAnchorPage:
- pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("page") );
- pAttrList->AddAttribute( A2OUSTR("text:anchor-page-number"), Int32ToOUString(m_nAnchorPage) );
- break;
- case enumXFAnchorChar:
- pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("char") );
- break;
- case enumXFAnchorAsChar:
- pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("as-char") );
- break;
- case enumXFAnchorFrame:
- pAttrList->AddAttribute( A2OUSTR("text:anchor-type"), A2OUSTR("frame") );
- break;
- default:
- break;
- }
- pAttrList->AddAttribute( A2OUSTR("svg:x"), DoubleToOUString(m_aRect.GetX()) + A2OUSTR("cm") );
- pAttrList->AddAttribute( A2OUSTR("svg:y"), DoubleToOUString(m_aRect.GetY()) + A2OUSTR("cm") );
- pAttrList->AddAttribute( A2OUSTR("svg:width"), DoubleToOUString(m_aRect.GetWidth()) + A2OUSTR("cm") );
- pAttrList->AddAttribute( A2OUSTR("svg:height"), DoubleToOUString(m_aRect.GetHeight()) + A2OUSTR("cm") );
- pAttrList->AddAttribute( A2OUSTR("draw:z-index"), Int32ToOUString(m_nZIndex) );
-
- if( m_strNextLink.getLength() > 0 )
- pAttrList->AddAttribute( A2OUSTR("draw:chain-next-name"), m_strNextLink );
-
- pStrm->StartElement( A2OUSTR("draw:object-ole") );
-
- pAttrList->Clear();
- pStrm->StartElement( A2OUSTR("office:binary-data") );
- pStrm->Characters(m_strData);
- pStrm->EndElement( A2OUSTR("office:binary-data") );
-
- pStrm->EndElement( A2OUSTR("draw:object-ole") );
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfoleobj.hxx b/lotuswordpro/source/filter/xfilter/xfoleobj.hxx
deleted file mode 100644
index d2929a4..0000000
--- a/lotuswordpro/source/filter/xfilter/xfoleobj.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * The Contents of this file are made available subject to the terms of
- * either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- * Sun Microsystems Inc., October, 2000
- *
- * GNU Lesser General Public License Version 2.1
- * =============================================
- * Copyright 2000 by Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- *
- * Sun Industry Standards Source License Version 1.1
- * =================================================
- * The contents of this file are subject to the Sun Industry Standards
- * Source License Version 1.1 (the "License"); You may not use this file
- * except in compliance with the License. You may obtain a copy of the
- * License at http://www.openoffice.org/license.html.
- *
- * Software provided under this License is provided on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- * See the License for the specific provisions governing your rights and
- * obligations concerning the Software.
- *
- * The Initial Developer of the Original Code is: IBM Corporation
- *
- * Copyright: 2008 by IBM Corporation
- *
- * All Rights Reserved.
- *
- * Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-#ifndef _XFOLEOBJ_HXX
-#define _XFOLEOBJ_HXX
-
-#include "xfframe.hxx"
-
-/**
- * @brief
- * Ole object.
- * Ole object is a frame object, it inherits all properties of frame obejct.
- */
-class XFOleObject : public XFFrame
-{
-public:
- XFOleObject();
-
-public:
- /**
- * @descr Set ole object data. The data will be base64 encoded before sent to SODC.
- */
- void SetOleData(sal_uInt8 *buf, int len);
-
- /**
- * @descr output ole obejct.
- */
- virtual void ToXml(IXFStream *pStrm);
-
-private:
- rtl::OUString m_strData;
-};
-
-#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfoutlinestyle.cxx b/lotuswordpro/source/filter/xfilter/xfoutlinestyle.cxx
index 8417eb3..bceffe6 100644
--- a/lotuswordpro/source/filter/xfilter/xfoutlinestyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfoutlinestyle.cxx
@@ -105,25 +105,4 @@ void XFOutlineLevelStyle::ToXml(IXFStream *pStrm)
pStrm->EndElement( A2OUSTR("text:outline-level-style") );
}
-XFOutlineStyle::XFOutlineStyle()
-{
- for( int i=0; i<10; i++ )
- m_aLevels[i].SetLevel(i+1);
-}
-
-enumXFStyle XFOutlineStyle::GetStyleFamily()
-{
- return enumXFStyleOutline;
-}
-
-void XFOutlineStyle::ToXml(IXFStream *pStrm)
-{
- IXFAttrList *pAttrList = pStrm->GetAttrList();
- pAttrList->Clear();
-
- pStrm->StartElement( A2OUSTR("text:outline-style") );
- for( int i=0; i<10; i++ )
- m_aLevels[i].ToXml(pStrm);
- pStrm->EndElement( A2OUSTR("text:outline-style") );
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfoutlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfoutlinestyle.hxx
index 0e6f91b..aa38441 100644
--- a/lotuswordpro/source/filter/xfilter/xfoutlinestyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfoutlinestyle.hxx
@@ -94,31 +94,6 @@ private:
enumXFAlignType m_eAlign;
};
-class XFOutlineStyle : public XFStyle
-{
-public:
- XFOutlineStyle();
-
-public:
- void SetNumFmt(sal_Int32 level, XFNumFmt& fmt);
-
- void SetIndent(sal_Int32 level, double indent);
-
- void SetMinLabelWidth(sal_Int32 level, double labelWidth);
-
- void SetMinLabelDistance(sal_Int32 level, double distance);
-
- void SetTextAlign(sal_Int32 level, enumXFAlignType align);
-
- virtual enumXFStyle GetStyleFamily();
-
- virtual void ToXml(IXFStream *pStrm);
-
-private:
- XFOutlineLevelStyle m_aLevels[10];
-};
-
-
//
//XFOutlineLevelStyle:
//
@@ -152,39 +127,6 @@ inline void XFOutlineLevelStyle::SetTextAlign(enumXFAlignType align)
m_eAlign = align;
}
-//
-//XFOutlineStyle:
-//
-inline void XFOutlineStyle::SetNumFmt(sal_Int32 level, XFNumFmt& fmt)
-{
- assert(level>=1&&level<=10);
- m_aLevels[level].SetNumFmt(fmt);
-}
-
-inline void XFOutlineStyle::SetIndent(sal_Int32 level, double indent)
-{
- assert(level>=1&&level<=10);
- m_aLevels[level].SetIndent(indent);
-}
-
-inline void XFOutlineStyle::SetMinLabelWidth(sal_Int32 level, double width)
-{
- assert(level>=1&&level<=10);
- m_aLevels[level].SetMinLabelWidth(width);
-}
-
-inline void XFOutlineStyle::SetMinLabelDistance(sal_Int32 level, double distance)
-{
- assert(level>=1&&level<=10);
- m_aLevels[level].SetMinLabelDistance(distance);
-}
-
-inline void XFOutlineStyle::SetTextAlign(sal_Int32 level, enumXFAlignType align)
-{
- assert(level>=1&&level<=10);
- m_aLevels[level].SetTextAlign(align);
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
index 7eb811a..6a2fbae 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx
@@ -85,7 +85,7 @@ XFParaStyle::XFParaStyle()
m_bNumberRight = sal_False;
}
-XFParaStyle::XFParaStyle(XFParaStyle& other):XFStyle(other)
+XFParaStyle::XFParaStyle(const XFParaStyle& other) : XFStyle(other)
{
m_strParentStyleName = other.m_strParentStyleName;
m_nFlag = other.m_nFlag;
@@ -119,10 +119,10 @@ XFParaStyle::XFParaStyle(XFParaStyle& other):XFStyle(other)
// m_aTabs = other.m_aTabs;
for (size_t i=0; i<other.m_aTabs.GetCount(); ++i)
{
- IXFStyle *pStyle = other.m_aTabs.Item(i);
+ const IXFStyle *pStyle = other.m_aTabs.Item(i);
if( pStyle )
{
- XFTabStyle *pTabStyle = (XFTabStyle*)(pStyle);
+ const XFTabStyle *pTabStyle = dynamic_cast<const XFTabStyle*>(pStyle);
if( pTabStyle )
{
XFTabStyle *pCopyStyle = new XFTabStyle(*pTabStyle);
@@ -132,7 +132,7 @@ XFParaStyle::XFParaStyle(XFParaStyle& other):XFStyle(other)
}
}
-XFParaStyle& XFParaStyle::operator=(XFParaStyle& other)
+XFParaStyle& XFParaStyle::operator=(const XFParaStyle& other)
{
m_strParentStyleName = other.m_strParentStyleName;
m_nFlag = other.m_nFlag;
@@ -166,10 +166,10 @@ XFParaStyle& XFParaStyle::operator=(XFParaStyle& other)
// m_aTabs = other.m_aTabs;
for (size_t i=0; i<other.m_aTabs.GetCount(); ++i)
{
- IXFStyle *pStyle = other.m_aTabs.Item(i);
+ const IXFStyle *pStyle = other.m_aTabs.Item(i);
if( pStyle )
{
- XFTabStyle *pTabStyle = (XFTabStyle*)(pStyle);
+ const XFTabStyle *pTabStyle = dynamic_cast<const XFTabStyle*>(pStyle);
if( pTabStyle )
{
XFTabStyle *pCopyStyle = new XFTabStyle(*pTabStyle);
diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
index ea66396..e4e0327 100644
--- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx
@@ -90,9 +90,9 @@ class XFParaStyle : public XFStyle
public:
XFParaStyle();
- XFParaStyle(XFParaStyle& other);
+ XFParaStyle(const XFParaStyle& other);
- XFParaStyle& operator=(XFParaStyle& other);
+ XFParaStyle& operator=(const XFParaStyle& other);
virtual ~XFParaStyle();
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 7303726..5cef25b 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -184,7 +184,7 @@ IXFStyle* XFStyleContainer::FindStyle(rtl::OUString name)
return NULL;
}
-IXFStyle* XFStyleContainer::Item(size_t index)
+const IXFStyle* XFStyleContainer::Item(size_t index) const
{
assert(index<m_aStyles.size());
if (index < m_aStyles.size())
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
index 2d209e3..ccbc19d 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.hxx
@@ -107,12 +107,12 @@ public:
/**
* @descr get count of styles in the container.
*/
- size_t GetCount();
+ size_t GetCount() const;
/**
* @descr get style by index.
*/
- IXFStyle* Item(size_t index);
+ const IXFStyle* Item(size_t index) const;
/**
* @descr Output all style.
@@ -128,7 +128,7 @@ private:
rtl::OUString m_strStyleNamePrefix;
};
-inline size_t XFStyleContainer::GetCount()
+inline size_t XFStyleContainer::GetCount() const
{
return m_aStyles.size();
}
diff --git a/unusedcode.easy b/unusedcode.easy
index 255c891..d6bf506 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -161,9 +161,6 @@ FileControl::SetButtonText(String const&)
FileList::GetFormat()
FileStat::FileStat(void const*, void const*)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
-FilterConfigItem::WriteString(rtl::OUString const&, rtl::OUString const&)
-FixedBitmap::GetModeBitmap() const
-FixedBitmap::SetModeBitmap(Bitmap const&)
FixedBorder::FixedBorder(Window*, long)
FixedBorder::SetBorderType(unsigned short)
FixedBorder::SetTransparent(unsigned char)
@@ -367,6 +364,7 @@ OUStringsSort_Impl::Remove(rtl::OUString* const&, unsigned short)
OUStringsSort_Impl::Remove(unsigned short, unsigned short)
Octree::AddColor(BitmapColor const&)
Octree::Octree(unsigned long)
+OdtGeneratorPrivate::_writeBegin()
OutlinerView::AdjustDepth(Paragraph*, short, unsigned char)
OutlinerView::AdjustHeight(Paragraph*, long, unsigned char)
OutlinerView::Collapse(Paragraph*)
@@ -401,6 +399,8 @@ OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
OutputDevice::PixelToLogic(Region const&, MapMode const&) const
OutputDevice::PixelToLogic(basegfx::B2DPolyPolygon const&) const
OutputDevice::PixelToLogic(basegfx::B2DPolygon const&) const
+PageSpan::getMarginLeft() const
+PageSpan::getMarginRight() const
ParaPortion::DbgCheckTextPortions()
ParaPortionList::DbgCheck(EditDoc&)
ParagraphList::GetVisPos(Paragraph*) const
@@ -1527,40 +1527,15 @@ XFCellStyle::SetIndent(double)
XFCellStyle::SetMargins(double, double, double, double)
XFCellStyle::SetParentStyle(rtl::OUString)
XFCellStyle::SetShadow(enumXFShadowPos, double, XFColor&)
-XFColumn::GetMarginLeft()
-XFColumn::GetMarginRight()
-XFColumn::GetRelWidth()
XFColumns::GetCount()
-XFColumns::SetSeperator(int, double, XFColor, enumXFAlignType)
-XFDrawCircle::XFDrawCircle()
-XFDrawCircle::XFDrawCircle(XFPoint, double)
-XFDrawEllipse::XFDrawEllipse()
-XFDrawPath::CalcViewBox()
-XFFileStream::XFFileStream(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)
-XFFloatFrame::XFFloatFrame(int)
-XFFontDecl::SetFontFamily(rtl::OUString)
-XFFontDecl::SetFontName(rtl::OUString)
-XFFontDecl::SetFontPitchFixed(unsigned char)
-XFFontDecl::XFFontDecl()
-XFGlobal::GenGraphName()
-XFGlobal::GenObjName()
XFHeaderStyle::SetPadding(double, double, double, double)
XFIndex::AddEntry(rtl::OUString, rtl::OUString)
XFIndex::AddTemplate(unsigned int, rtl::OUString, enumXFIndexTemplate, enumXFIndexTemplate, enumXFIndexTemplate, enumXFIndexTemplate)
-XFIndex::GetEntryCount()
-XFIndex::SetDefaultAlphaIndex(rtl::OUString, unsigned char, unsigned char)
-XFIndex::SetSectionStyle(rtl::OUString)
-XFIndex::SetTitle(rtl::OUString, rtl::OUString)
XFList::AddItem(rtl::OUString)
XFList::SetHeader(XFListItem*)
XFList::XFList(unsigned char)
-XFMasterPage::SetPageMaster(XFPageMaster*)
-XFNumberStyle::XFNumberStyle(enumXFNumberType)
XFOfficeMeta::SetGenerator(rtl::OUString)
XFOfficeMeta::SetTitle(rtl::OUString)
-XFOleObject::SetOleData(unsigned char*, int)
-XFOleObject::XFOleObject()
-XFOutlineStyle::XFOutlineStyle()
XFParaStyle::XFParaStyle(XFParaStyle&)
XFParagraph::ClearContents()
XFParagraph::XFParagraph(rtl::OUString&, rtl::OUString&)
@@ -2370,6 +2345,8 @@ comphelper::findProperty(com::sun::star::beans::Property&, com::sun::star::uno::
comphelper::getPathToSystemRegistry()
comphelper::getPathToUserRegistry()
comphelper::string::isalnumAsciiString(rtl::OUString const&)
+comphelper::string::islowerAsciiString(rtl::OUString const&)
+comphelper::string::isupperAsciiString(rtl::OUString const&)
comphelper::string::searchAndReplaceAllAsciiWithAscii(rtl::OUString const&, char const*, char const*, int)
connectivity::OKeyValue::OKeyValue()
connectivity::ORowSetValue::setFromDouble(double const&, int)
commit d1340a6e4d7659a1a1f0fa6bcd57c28cf38e8fe7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 08:55:02 2011 +0100
WaE: unused variable
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index 764c8bb..4b214ab 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -99,7 +99,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri
#endif
return sal_True;
}
- catch( const uno::Exception& rEx)
+ catch (const uno::Exception&)
{
return sal_False;
}
commit 3fed9f3b46ecf5e7bcccb6a04311621860fbafbe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 00:59:53 2011 +0100
fix typos and includes
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index f8199a6..3f227b4 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2712,7 +2712,7 @@ bool ScCompiler::IsPredetectedReference( const String& rName )
return false; // :#REF!.AB42 or :#REF!42 or :#REF!#REF!
break;
default:
- if (comphelper::string::isalpha(c) &&
+ if (comphelper::string::isalphaAscii(c) &&
((mnPredetectedReference > 1 && ':' == c2) || 0 == c2))
return false; // AB#REF!: or AB#REF!
}
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index b07c242..0640ee7 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <com/sun/star/uri/XVndSunStarExpandUrl.hpp>
#include <comphelper/locale.hxx>
+#include <comphelper/string.hxx>
namespace treeview {
commit 3829892dbc5475a49250729541be369ea9532d28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 00:36:22 2011 +0100
merge together 5 or ascii isalpha/isalnum/isdigit implementations
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx
index 627c04c..0fadc73 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -353,6 +353,11 @@ COMPHELPER_DLLPUBLIC inline bool isdigitAscii(sal_Unicode c)
return ((c >= '0') && (c <= '9'));
}
+COMPHELPER_DLLPUBLIC inline bool isxdigitAscii(sal_Unicode c)
+{
+ return isdigitAscii(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
+}
+
COMPHELPER_DLLPUBLIC inline bool islowerAscii(sal_Unicode c)
{
return ((c >= 'a') && (c <= 'z'));
@@ -363,9 +368,14 @@ COMPHELPER_DLLPUBLIC inline bool isupperAscii(sal_Unicode c)
return ((c >= 'A') && (c <= 'Z'));
}
+COMPHELPER_DLLPUBLIC inline bool isalphaAscii(sal_Unicode c)
+{
+ return islowerAscii(c) || isupperAscii(c);
+}
+
COMPHELPER_DLLPUBLIC inline bool isalnumAscii(sal_Unicode c)
{
- return isdigitAscii(c) || islowerAscii(c) || isupperAscii(c);
+ return isalphaAscii(c) || isdigitAscii(c);
}
} }
diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index b0f498f..021acad 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -38,6 +38,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
#include <unotools/processfactory.hxx>
+#include <comphelper/string.hxx>
#include <stdio.h>
@@ -66,10 +67,8 @@ CSerializationURLEncoded::CSerializationURLEncoded()
*/
sal_Bool CSerializationURLEncoded::is_unreserved(sal_Char c)
{
- //digit?
- if (c >= '0' && c <= '9') return sal_True;
- if (c >= 'A' && c <= 'Z') return sal_True;
- if (c >= 'a' && c <= 'z') return sal_True;
+ if (comphelper::string::isalnumAscii(c))
+ return sal_True;
switch (c) {
case '-':
case '_':
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 2c14b86..f8199a6 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/sheet/FormulaMapGroup.hpp>
#include <comphelper/processfactory.hxx>
#include <unotools/transliterationwrapper.hxx>
+#include <comphelper/string.hxx>
#include <tools/urlobj.hxx>
#include <rtl/math.hxx>
#include <ctype.h>
@@ -2711,7 +2712,7 @@ bool ScCompiler::IsPredetectedReference( const String& rName )
return false; // :#REF!.AB42 or :#REF!42 or :#REF!#REF!
break;
default:
- if ((('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z')) &&
+ if (comphelper::string::isalpha(c) &&
((mnPredetectedReference > 1 && ':' == c2) || 0 == c2))
return false; // AB#REF!: or AB#REF!
}
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 44dfe32..1524397 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -62,6 +62,7 @@
#include <vcl/help.hxx>
#include <vcl/cursor.hxx>
#include <tools/urlobj.hxx>
+#include <comphelper/string.hxx>
#include <formula/formulahelper.hxx>
#include "inputwin.hxx"
@@ -768,7 +769,7 @@ void ScInputHandler::ShowTipCursor()
if( nLeftParentPos != STRING_NOTFOUND )
{
sal_Unicode c = ( nLeftParentPos > 0 ) ? aSelText.GetChar( nLeftParentPos-1 ) : 0;
- if( !((c >= 'A' && c<= 'Z') || (c>= 'a' && c<= 'z' )) )
+ if( !(comphelper::string::isalphaAscii(c)) )
continue;
nNextFStart = aHelper.GetFunctionStart( aSelText, nLeftParentPos, sal_True);
if( aHelper.GetNextFunc( aSelText, false, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) )
@@ -1012,7 +1013,7 @@ void ScInputHandler::UseFormulaData()
// nLeftParentPos can be 0 if a parenthesis is inserted before the formula
sal_Unicode c = ( nLeftParentPos > 0 ) ? aFormula.GetChar( nLeftParentPos-1 ) : 0;
- if( !((c >= 'A' && c<= 'Z') || (c>= 'a' && c<= 'z') ) )
+ if( !(comphelper::string::isalphaAscii(c)) )
continue;
nNextFStart = aHelper.GetFunctionStart( aFormula, nLeftParentPos, sal_True);
if( aHelper.GetNextFunc( aFormula, false, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) )
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 5f1737c..8cea144 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -51,6 +51,7 @@
#include "fupoor.hxx"
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
+#include <comphelper/string.hxx>
namespace sd {
@@ -391,16 +392,14 @@ bool DrawDocShell::IsNewPageNameValid( String & rInOutPageName, bool bResetStrin
bIsStandardName = true;
}
}
- else if( rInOutPageName.GetToken( 1, sal_Unicode(' ') ).GetChar(0) >= 'a' &&
- rInOutPageName.GetToken( 1, sal_Unicode(' ') ).GetChar(0) <= 'z' &&
- rInOutPageName.GetToken( 1, sal_Unicode(' ') ).Len() == 1 )
+ else if( rInOutPageName.GetToken( 1, sal_Unicode(' ') ).Len() == 1 &&
+ comphelper::string::islowerAscii(rInOutPageName.GetToken( 1, sal_Unicode(' ') ).GetChar(0) ) )
{
// lower case, single character: reserved
bIsStandardName = true;
}
- else if( rInOutPageName.GetToken( 1, sal_Unicode(' ') ).GetChar(0) >= 'A' &&
- rInOutPageName.GetToken( 1, sal_Unicode(' ') ).GetChar(0) <= 'Z' &&
- rInOutPageName.GetToken( 1, sal_Unicode(' ') ).Len() == 1 )
+ else if( rInOutPageName.GetToken( 1, sal_Unicode(' ') ).Len() == 1 &&
+ comphelper::string::isupperAscii(rInOutPageName.GetToken( 1, sal_Unicode(' ') ).GetChar(0) ) )
{
// upper case, single character: reserved
bIsStandardName = true;
diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst
index c7a1fe6..f55be30 100644
--- a/stoc/prj/build.lst
+++ b/stoc/prj/build.lst
@@ -1,4 +1,4 @@
-tc stoc : DESKTOP:rdbmaker cppuhelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt registry NULL
+tc stoc : DESKTOP:rdbmaker cppuhelper comphelper cppu jvmaccess sal salhelper jvmfwk xmlreader LIBXSTL:libxslt registry NULL
tc stoc usr1 - all tc_mkout NULL
tc stoc\inc nmake - all tc_inc NULL
tc stoc\source\defaultregistry nmake - all tc_defr tc_boot tc_inc NULL
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 1d87c69..afba3ca 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -51,6 +51,7 @@
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase2.hxx"
#include "cppuhelper/weak.hxx"
+#include "comphelper/string.hxx"
#include "osl/diagnose.h"
#include "rtl/string.h"
#include "rtl/ustrbuf.hxx"
@@ -64,30 +65,16 @@
namespace css = com::sun::star;
-namespace {
-
-bool isDigit(sal_Unicode c) { //TODO: generally available?
- return c >= '0' && c <= '9';
-}
+using comphelper::string::isalphaAscii;
+using comphelper::string::isdigitAscii;
+using comphelper::string::isxdigitAscii;
+using comphelper::string::islowerAscii;
+using comphelper::string::isupperAscii;
-bool isUpperCase(sal_Unicode c) { //TODO: generally available?
- return c >= 'A' && c <= 'Z';
-}
-
-bool isLowerCase(sal_Unicode c) { //TODO: generally available?
- return c >= 'a' && c <= 'z';
-}
-
-bool isAlpha(sal_Unicode c) { //TODO: generally available?
- return isUpperCase(c) || isLowerCase(c);
-}
-
-bool isHexDigit(sal_Unicode c) { //TODO: generally available?
- return isDigit(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
-}
+namespace {
sal_Unicode toLowerCase(sal_Unicode c) { //TODO: generally available?
- return isUpperCase(c) ? c + ('a' - 'A') : c;
+ return isupperAscii(c) ? c + ('a' - 'A') : c;
}
bool equalIgnoreCase(sal_Unicode c1, sal_Unicode c2) {
@@ -99,8 +86,8 @@ bool equalIgnoreEscapeCase(rtl::OUString const & s1, rtl::OUString const & s2) {
if (s1.getLength() == s2.getLength()) {
for (sal_Int32 i = 0; i < s1.getLength();) {
if (s1[i] == '%' && s2[i] == '%' && s1.getLength() - i > 2
- && isHexDigit(s1[i + 1]) && isHexDigit(s1[i + 2])
- && isHexDigit(s2[i + 1]) && isHexDigit(s2[i + 2])
+ && isxdigitAscii(s1[i + 1]) && isxdigitAscii(s1[i + 2])
+ && isxdigitAscii(s2[i + 1]) && isxdigitAscii(s2[i + 2])
&& equalIgnoreCase(s1[i + 1], s2[i + 1])
&& equalIgnoreCase(s1[i + 2], s2[i + 2]))
{
@@ -118,12 +105,12 @@ bool equalIgnoreEscapeCase(rtl::OUString const & s1, rtl::OUString const & s2) {
}
sal_Int32 parseScheme(rtl::OUString const & uriReference) {
- if (uriReference.getLength() >= 2 && isAlpha(uriReference[0])) {
+ if (uriReference.getLength() >= 2 && isalphaAscii(uriReference[0])) {
for (sal_Int32 i = 0; i < uriReference.getLength(); ++i) {
sal_Unicode c = uriReference[i];
if (c == ':') {
return i;
- } else if (!isAlpha(c) && !isDigit(c) && c != '+' && c != '-'
+ } else if (!isalphaAscii(c) && !isdigitAscii(c) && c != '+' && c != '-'
&& c != '.')
{
break;
@@ -392,7 +379,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.uri.UriSchemeParser_"));
for (sal_Int32 i = 0; i < scheme.getLength(); ++i) {
sal_Unicode c = scheme[i];
- if (isUpperCase(c)) {
+ if (isupperAscii(c)) {
buf.append(toLowerCase(c));
} else if (c == '+') {
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("PLUS"));
@@ -401,7 +388,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::parse(
} else if (c == '.') {
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("DOT"));
} else {
- OSL_ASSERT(isLowerCase(c) || isDigit(c));
+ OSL_ASSERT(islowerAscii(c) || isdigitAscii(c));
buf.append(c);
}
}
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 86c72fb..b7aa067 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -32,7 +32,8 @@
#include "passwordcontainer.hxx"
#include <unotools/pathoptions.hxx>
-#include "cppuhelper/factory.hxx"
+#include <cppuhelper/factory.hxx>
+#include <comphelper/string.hxx>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/task/MasterPasswordRequest.hpp>
@@ -42,10 +43,6 @@
#include <rtl/digest.h>
#include <rtl/byteseq.hxx>
-#ifndef _TOOLS_INETSTRM_HXX
-// @@@ #include <inetstrm.hxx>
-#endif
-
using namespace std;
using namespace osl;
using namespace utl;
@@ -73,9 +70,7 @@ static ::rtl::OUString createIndex( vector< ::rtl::OUString > lines )
while( *pLine )
{
- if( ( *pLine >= 'A' && *pLine <= 'Z' )
- || ( *pLine >= 'a' && *pLine <= 'z' )
- || ( *pLine >= '0' && *pLine <= '9' ) )
+ if (comphelper::string::isalnumAscii(*pLine))
{
aResult += ::rtl::OString::valueOf( *pLine );
}
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index df9c9d1..dc4e9a3 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -32,9 +32,9 @@
#include <svtools/syntaxhighlight.hxx>
#include <unotools/charclass.hxx>
+#include <comphelper/string.hxx>
#include <tools/debug.hxx>
-
// ##########################################################################
// ATTENTION: all these words needs to be in small caps
// ##########################################################################
@@ -261,22 +261,10 @@ class BasicSimpleCharClass
static LetterTable aLetterTable;
public:
- static sal_Bool isAlpha( sal_Unicode c, bool bCompatible )
- {
- sal_Bool bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
- || (bCompatible && aLetterTable.isLetter( c ));
- return bRet;
- }
-
- static sal_Bool isDigit( sal_Unicode c )
- {
- sal_Bool bRet = (c >= '0' && c <= '9');
- return bRet;
- }
-
- static sal_Bool isAlphaNumeric( sal_Unicode c, bool bCompatible )
+ static sal_Bool isAlpha( sal_Unicode c )
{
- sal_Bool bRet = isDigit( c ) || isAlpha( c, bCompatible );
+ sal_Bool bRet = comphelper::string::isalphaAscii(c) ||
+ aLetterTable.isLetter(c);
return bRet;
}
};
@@ -373,7 +361,7 @@ sal_Bool SimpleTokenizer_Impl::testCharFlags( sal_Unicode c, sal_uInt16 nTestFla
else if( c > 255 )
{
bRet = (( CHAR_START_IDENTIFIER | CHAR_IN_IDENTIFIER ) & nTestFlags) != 0
- ? BasicSimpleCharClass::isAlpha( c, true ) : false;
+ ? BasicSimpleCharClass::isAlpha(c) : false;
}
return bRet;
}
@@ -484,7 +472,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
{
// Naechstes Zeichen holen
c = peekChar();
- bIdentifierChar = BasicSimpleCharClass::isAlpha( c, true );
+ bIdentifierChar = BasicSimpleCharClass::isAlpha(c);
if( bIdentifierChar )
getChar();
}
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 8cfe024..770f03b 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -432,12 +432,12 @@ int HTMLParser::FilterToken( int nToken )
return nToken;
}
-#define HTML_ISDIGIT( c ) (c >= '0' && c <= '9')
-#define HTML_ISALPHA( c ) ( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') )
-#define HTML_ISALNUM( c ) ( HTML_ISALPHA(c) || HTML_ISDIGIT(c) )
+#define HTML_ISDIGIT( c ) comphelper::string::isdigitAscii(c)
+#define HTML_ISALPHA( c ) comphelper::string::isalphaAscii(c)
+#define HTML_ISALNUM( c ) comphelper::string::isalnumAscii(c)
#define HTML_ISSPACE( c ) ( ' ' == c || (c >= 0x09 && c <= 0x0d) )
#define HTML_ISPRINTABLE( c ) ( c >= 32 && c != 127)
-#define HTML_ISHEXDIGIT( c ) ( HTML_ISDIGIT(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f') )
+#define HTML_ISHEXDIGIT( c ) comphelper::string::isxdigitAscii(c)
int HTMLParser::ScanText( const sal_Unicode cBreak )
{
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 5a04328..02b102e 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -36,12 +36,13 @@
#include <svtools/rtftoken.h>
#include <svtools/rtfkeywd.hxx>
#include <svtools/parrtf.hxx>
+#include <comphelper/string.hxx>
const int MAX_STRING_LEN = 1024;
const int MAX_TOKEN_LEN = 128;
-#define RTF_ISDIGIT( c ) (c >= '0' && c <= '9')
-#define RTF_ISALPHA( c ) ( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') )
+#define RTF_ISDIGIT( c ) comphelper::string::isdigitAscii(c)
+#define RTF_ISALPHA( c ) comphelper::string::isalphaAscii(c)
SvRTFParser::SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize )
: SvParser( rIn, nStackSize ),
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 6356952..cb3a376 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -36,7 +36,7 @@
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
#include <svtools/htmltokn.h>
-
+#include <comphelper/string.hxx>
#include "css1kywd.hxx"
#include "parcss1.hxx"
@@ -157,18 +157,15 @@ CSS1Token CSS1Parser::GetNextToken()
case '@': // '@import' | '@XXX'
{
cNextCh = GetNextChar();
- if( ('A' <= cNextCh && cNextCh <= 'Z') ||
- ('a' <= cNextCh && cNextCh <= 'z') )
+ if (comphelper::string::isalphaAscii(cNextCh))
{
// den naechsten Identifer scannen
::rtl::OUStringBuffer sTmpBuffer( 32L );
do {
sTmpBuffer.append( cNextCh );
cNextCh = GetNextChar();
- } while( ('A' <= cNextCh && cNextCh <= 'Z') ||
- ('a' <= cNextCh && cNextCh <= 'z') ||
- ('0' <= cNextCh && cNextCh <= '9') ||
- ('-'==cNextCh && !IsEOF()) );
+ } while( (comphelper::string::isalnumAscii(cNextCh) ||
+ '-' == cNextCh) && !IsEOF() );
aToken += String(sTmpBuffer.makeStringAndClear());
@@ -263,10 +260,8 @@ CSS1Token CSS1Parser::GetNextToken()
do {
sTmpBuffer.append( cNextCh );
cNextCh = GetNextChar();
- } while( ('A' <= cNextCh && cNextCh <= 'Z') ||
- ('a' <= cNextCh && cNextCh <= 'z') ||
- ('0' <= cNextCh && cNextCh <= '9') ||
- ('-' == cNextCh && !IsEOF()) );
+ } while( (comphelper::string::isalnumAscii(cNextCh) ||
+ '-' == cNextCh) && !IsEOF() );
aToken += String(sTmpBuffer.makeStringAndClear());
@@ -409,10 +404,8 @@ CSS1Token CSS1Parser::GetNextToken()
do {
sTmpBuffer2.append( cNextCh );
cNextCh = GetNextChar();
- } while( ( ('A' <= cNextCh && cNextCh <= 'Z') ||
- ('a' <= cNextCh && cNextCh <= 'z') ||
- ('0' <= cNextCh && cNextCh <= '9') ||
- '-'==cNextCh) && !IsEOF() );
+ } while( (comphelper::string::isalnumAscii(cNextCh) ||
+ '-' == cNextCh) && !IsEOF() );
aIdent += String(sTmpBuffer2.makeStringAndClear());
@@ -606,9 +599,7 @@ CSS1Token CSS1Parser::GetNextToken()
// kein break;
default: // IDENT | syntax error
- // TODO IsAlpha
- if( ('A' <= cNextCh && cNextCh <= 'Z') ||
- ('a' <= cNextCh && cNextCh <= 'z') )
+ if (comphelper::string::isalphaAscii(cNextCh))
{
// IDENT
@@ -626,12 +617,8 @@ CSS1Token CSS1Parser::GetNextToken()
('a'<=cNextCh && 'f'>=cNextCh) );
}
cNextCh = GetNextChar();
- // TODO: AlphaNumeric
- } while( ( ('0'<=cNextCh && '9'>=cNextCh) ||
- ('A'<=cNextCh && 'Z'>=cNextCh) ||
- ('a'<=cNextCh && 'z'>=cNextCh) ||
- '-'==cNextCh ) &&
- !IsEOF() );
+ } while( (comphelper::string::isalnumAscii(cNextCh) ||
+ '-' == cNextCh) && !IsEOF() );
aToken += String(sTmpBuffer.makeStringAndClear());
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 78994ab..3db77a0 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -46,6 +46,7 @@
#include <svl/fstathelper.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/tempfile.hxx>
+#include <comphelper/string.hxx>
#include <swtypes.hxx>
#include <uitool.hxx>
#include <glosdoc.hxx>
@@ -68,10 +69,8 @@ String lcl_CheckFileName( const String& rNewFilePath,
for( xub_StrLen i = 0; i < rNewGroupName.Len(); i++ )
{
sal_Unicode cChar = rNewGroupName.GetChar(i);
- if( (cChar >= 'A' && cChar <= 'Z') ||
- (cChar >= 'a' && cChar <= 'z') ||
- (cChar >= '0' && cChar <= '9') ||
- cChar == '_' || cChar == 0x20 )
+ if (comphelper::string::isalnumAscii(cChar) ||
+ cChar == '_' || cChar == 0x20)
{
sRet += cChar;
}
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index b6d75ec..4c69540 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -63,6 +63,7 @@
#include <svl/macitem.hxx>
#include <editeng/acorrcfg.hxx>
#include <comphelper/servicehelper.hxx>
+#include <comphelper/string.hxx>
#include <memory>
@@ -195,9 +196,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName(
for(sal_Int32 nPos = 0; nPos < aGroupName.getLength(); nPos++)
{
sal_Unicode cChar = aGroupName[nPos];
- if( ((cChar >= 'A') && (cChar <= 'Z')) ||
- ((cChar >= 'a') && (cChar <= 'z')) ||
- ((cChar >= '0') && (cChar <= '9')) ||
+ if (comphelper::string::isalnumAscii(cChar) ||
(cChar == '_') ||
(cChar == 0x20) ||
(cChar == GLOS_DELIM) )
diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx
index 6216b85..9774a97 100644
--- a/sw/source/ui/vba/vbatemplate.cxx
+++ b/sw/source/ui/vba/vbatemplate.cxx
@@ -32,6 +32,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/text/XAutoTextContainer.hpp>
#include <tools/urlobj.hxx>
+#include <comphelper/string.hxx>
#include <osl/file.hxx>
using namespace ::ooo::vba;
@@ -44,10 +45,8 @@ String lcl_CheckGroupName( const String& rGroupName )
for( xub_StrLen i = 0; i < rGroupName.Len(); i++ )
{
sal_Unicode cChar = rGroupName.GetChar(i);
- if( (cChar >= 'A' && cChar <= 'Z') ||
- (cChar >= 'a' && cChar <= 'z') ||
- (cChar >= '0' && cChar <= '9') ||
- cChar == '_' || cChar == 0x20 )
+ if (comphelper::string::isalnumAscii(cChar) ||
+ cChar == '_' || cChar == 0x20)
{
sRet += cChar;
}
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index 18136bc..695c8bf 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -36,6 +36,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
+#include <comphelper/string.hxx>
namespace unnamed_ucb_regexp {} using namespace unnamed_ucb_regexp;
// unnamed namespaces don't work well yet...
@@ -186,29 +187,21 @@ bool Regexp::matches(rtl::OUString const & rString,
//============================================================================
namespace unnamed_ucb_regexp {
-inline bool isAlpha(sal_Unicode c)
-{
- return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
-}
-
-inline bool isDigit(sal_Unicode c)
-{
- return c >= '0' && c <= '9';
-}
-
bool isScheme(rtl::OUString const & rString, bool bColon)
{
+ using comphelper::string::isalphaAscii;
+ using comphelper::string::isdigitAscii;
// Return true if rString matches <scheme> (plus a trailing ":" if bColon
// is true) from RFC 2396:
sal_Unicode const * p = rString.getStr();
sal_Unicode const * pEnd = p + rString.getLength();
- if (p != pEnd && isAlpha(*p))
+ if (p != pEnd && isalphaAscii(*p))
for (++p;;)
{
if (p == pEnd)
return !bColon;
sal_Unicode c = *p++;
- if (!(isAlpha(c) || isDigit(c)
+ if (!(isalphaAscii(c) || isdigitAscii(c)
|| c == '+' || c == '-' || c == '.'))
return bColon && c == ':' && p == pEnd;
}
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 0c3e8fd..542167b 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -66,6 +66,7 @@
#include <l10ntools/compilehelp.hxx>
#include <comphelper/storagehelper.hxx>
+#include <comphelper/string.hxx>
#include "databases.hxx"
#include "urlparameter.hxx"
@@ -1686,8 +1687,7 @@ rtl::OUString ExtensionIteratorBase::implGetFileFromPackage(
inline bool isLetter( sal_Unicode c )
{
- bool bLetter = ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'));
- return bLetter;
+ return comphelper::string::isalphaAscii(c);
}
void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
@@ -1709,7 +1709,7 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::r
{
rtl::OUString aPureEntry = aEntry.copy( nLastSlash + 1 );
- // Check language sceme
+ // Check language scheme
int nLen = aPureEntry.getLength();
const sal_Unicode* pc = aPureEntry.getStr();
bool bStartCanBeLanguage = ( nLen >= 2 && isLetter( pc[0] ) && isLetter( pc[1] ) );
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index ce9acf0..b07c242 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -1144,8 +1144,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP
inline bool isLetter( sal_Unicode c )
{
- bool bLetter = ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'));
- return bLetter;
+ return comphelper::string::isalphaAscii(c);
}
void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< ::rtl::OUString > &rv,
commit de82a40f84c69081a517617989c344ec9597cb45
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 29 00:31:55 2011 +0100
callcatcher: drop various unused methods
diff --git a/basic/source/app/brkpnts.cxx b/basic/source/app/brkpnts.cxx
index 920e5ad..729aa50 100644
--- a/basic/source/app/brkpnts.cxx
+++ b/basic/source/app/brkpnts.cxx
@@ -70,16 +70,6 @@ BreakpointWindow::BreakpointWindow( Window *pParent )
Show();
}
-
-void BreakpointWindow::Reset()
-{
- for ( size_t i = 0, n = BreakpointList.size(); i < n; ++i )
- delete BreakpointList[ i ];
- BreakpointList.clear();
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list