[Libreoffice-commits] core.git: desktop/win32 extensions/source filter/inc filter/source oox/source sc/source sd/source sfx2/inc svx/source sw/source ucb/source vcl/coretext writerfilter/source
Thomas Arnhold
thomas at arnhold.org
Tue Mar 19 00:34:16 PDT 2013
desktop/win32/source/applauncher/launcher.cxx | 4 ++--
extensions/source/bibliography/bibload.cxx | 2 +-
filter/inc/filter/msfilter/escherex.hxx | 2 +-
filter/source/graphicfilter/egif/egif.cxx | 4 ++--
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 8 ++++----
oox/source/drawingml/diagram/diagram.hxx | 6 +++---
sc/source/ui/view/preview.cxx | 2 +-
sd/source/core/stlsheet.cxx | 4 ++--
sfx2/inc/sfx2/doctempl.hxx | 2 +-
svx/source/dialog/srchdlg.cxx | 4 ++--
sw/source/core/docnode/node.cxx | 2 +-
sw/source/core/text/txtfly.hxx | 6 +++---
ucb/source/ucp/cmis/cmis_content.cxx | 2 +-
vcl/coretext/salcoretextlayout.cxx | 2 +-
writerfilter/source/dmapper/TablePositionHandler.cxx | 2 +-
writerfilter/source/resourcemodel/qnametostrcore.cxx | 2 +-
16 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 506e1efab370626dae5e3122b6876f5a1e0b1029
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 19 01:30:44 2013 +0100
trailing whitespaces
Change-Id: I3d0e2015e4c9f0ea6118fd92892022607fe4bde6
diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx
index b09068d..d72d7dd 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -44,7 +44,7 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
#endif
{
// Set an explicit Application User Model ID for the process
-
+
WCHAR szShell32[MAX_PATH];
GetSystemDirectoryW(szShell32, MAX_PATH);
wcscat(szShell32, L"\\Shell32.dll");
@@ -76,7 +76,7 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
}
}
}
- FreeLibrary(hinstDll);
+ FreeLibrary(hinstDll);
// Retrieve startup info
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 5527403..15a510e 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -232,7 +232,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUS
{
SolarMutexGuard aGuard;
-
+
m_pBibMod = OpenBibModul();
String aURLStr( rURL );
diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx
index 33cde07..e09303d 100644
--- a/filter/inc/filter/msfilter/escherex.hxx
+++ b/filter/inc/filter/msfilter/escherex.hxx
@@ -1585,7 +1585,7 @@ public:
class ImplEscherExSdr.
*/
inline SvStream* QueryPictureStream() { return mxGlobal->QueryPictureStream(); }
-
+
/// Inserts internal data into the EscherStream, this process
/// may and has to be executed only once
/// If pPicStreamMergeBSE is known, the BLIPs from this stream are being
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 5962bf2..a774534 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -312,7 +312,7 @@ void GIFWriter::WriteGlobalHeader( const Size& rSize )
m_rGIF << cFlags;
m_rGIF << (sal_uInt8) 0x00;
m_rGIF << (sal_uInt8) 0x00;
-
+
// write dummy palette with two entries (black/white);
// we do this only because of a bug in Photoshop, since those can't
// read pictures without a global color palette
@@ -332,7 +332,7 @@ void GIFWriter::WriteLoopExtension( const Animation& rAnimation )
DBG_ASSERT( rAnimation.Count() > 0, "Animation has no bitmaps!" );
sal_uInt16 nLoopCount = (sal_uInt16) rAnimation.GetLoopCount();
-
+
// if only one run should take place
// the LoopExtension won't be written
// The default in this case is a single run
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 98732a4..727b5d4 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -451,14 +451,14 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
int bUseDocType = m_pFilterInfo->maDocType.isEmpty() ? 0 : 1;
Sequence< PropertyValue > aSourceData( 2 + bUseDocType );
int i = 0;
-
-
+
+
aSourceData[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ) );
aSourceData[i++].Value <<= xIS;
-
+
aSourceData[i].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Indent" ) );
aSourceData[i++].Value <<= (sal_Bool)sal_True;
-
+
if( bUseDocType )
{
aSourceData[i ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("DocType_Public"));
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 86fdcbc..93e8104 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -43,7 +43,7 @@ namespace dgm {
*/
struct Connection
{
- Connection() :
+ Connection() :
mnType( 0 ),
mnSourceOrder( 0 ),
mnDestOrder( 0 )
@@ -60,7 +60,7 @@ struct Connection
OUString msSibTransId;
sal_Int32 mnSourceOrder;
sal_Int32 mnDestOrder;
-
+
};
typedef std::vector< Connection > Connections;
@@ -70,7 +70,7 @@ typedef std::vector< Connection > Connections;
*/
struct Point
{
- Point() :
+ Point() :
mnType(0),
mnMaxChildren(-1),
mnPreferredChildren(-1),
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index b16bb41..8ad3ec4 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -847,7 +847,7 @@ void ScPreview::DoInvalidate()
{
// If the whole GetState of the shell is called
// The Invalidate must come behind asynchronously
-
+
if (bInGetState)
Application::PostUserEvent( STATIC_LINK( this, ScPreview, InvalidateHdl ) );
else
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 6796c67..bb0e558 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -404,11 +404,11 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
{
aRealStyle = pPage->GetLayoutName();
// cut after seperator string
-
+
if( aRealStyle.indexOf(aSep) >= 0)
{
aRealStyle = aRealStyle.copy(0,(aRealStyle.indexOf(aSep) + aSep.getLength()));
- }
+ }
}
}
if (aRealStyle.isEmpty())
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index 54e53c6..ee91fd4 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -93,7 +93,7 @@ public:
sal_Bool InsertDir(const String &rText, sal_uInt16 nRegion);
/** Change the name of an entry or a directory
-
+
\param rName
The new name to set
\param nRegion
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 4a2211d..5ef415f 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2167,7 +2167,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
// -----------------------------------------------------------------------
IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
-{
+{
SvtModuleOptions::EFactory eFactory = getModule(rBindings);
bool bWriterApp =
eFactory == SvtModuleOptions::E_WRITER ||
@@ -2182,7 +2182,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
if (bWriterApp)
aLayoutBtn.SetText( aLayoutWriterStr);
else
- aLayoutBtn.SetText( aStylesStr );
+ aLayoutBtn.SetText( aStylesStr );
}
bFormat = sal_False;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 83c889b..e126cde 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1835,7 +1835,7 @@ void SwCntntNode::ChkCondColl()
{
if( IsTxtNode() && ((SwTxtNode*)this)->GetNumRule())
{
- // Is at which Level in a list?
+ // Is at which Level in a list?
aTmp.SetCondition( PARA_IN_LIST,
((SwTxtNode*)this)->GetActualListLevel() );
pCColl = ((SwConditionTxtFmtColl*)GetFmtColl())->
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 4d7cdde..4c1398f 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -103,15 +103,15 @@ public:
is: they are converted to frame- and window-local coordinates.
If multiple frames with wrap attributes are located on the same line, we get
the following settings for the text flow:
-
+
L/R P L R N
P -P-P- -P-L -P R- -P N
L -L P- -L L -L R- -L N
R R-P- R-L R R- R N
N N P- N L N R- N N
-
+
(P=parallel, L=left, R=right, N=no wrap)
-
+
We can describe the behaviour as follows:
Every frame can push away text, with the restriction that it only has influence
until the next frame.
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 7b9dbfc..8791e36 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -372,7 +372,7 @@ namespace cmis
string sName = OUSTR_TO_STDSTR( aParentUrl.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ) );
aParentUrl.removeSegment( );
rtl::OUString sParentUrl = aParentUrl.GetMainURL( INetURLObject::NO_DECODE );
-
+
Content aParent( m_xContext, m_pProvider, new ucbhelper::ContentIdentifier( sParentUrl ) );
libcmis::FolderPtr pParentFolder = boost::dynamic_pointer_cast< libcmis::Folder >( aParent.getObject( xEnv ) );
if ( pParentFolder )
diff --git a/vcl/coretext/salcoretextlayout.cxx b/vcl/coretext/salcoretextlayout.cxx
index a2c7c04..0183c66 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -66,7 +66,7 @@ private:
mutable int* mpGlyphAdvances; // glyph widths for the justified layout
- mutable CGPoint* mpGlyphPositions;
+ mutable CGPoint* mpGlyphPositions;
mutable CTTypesetterRef mpTypesetter;
mutable CTLineRef mpLine;
mutable bool mbHasBoundRectangle;
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index 8ae6ac2..46324a1 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -118,7 +118,7 @@ uno::Sequence<beans::PropertyValue> TablePositionHandler::getTablePosition() con
nHoriOrient = text::HoriOrientation::OUTSIDE;
else if ( m_aXSpec == "right" )
nHoriOrient = text::HoriOrientation::RIGHT;
-
+
sal_Int16 nHoriOrientRelation;
if ( m_aHorzAnchor == "margin" )
nHoriOrientRelation = text::RelOrientation::PAGE_PRINT_AREA;
diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx b/writerfilter/source/resourcemodel/qnametostrcore.cxx
index 81ed0f1..e43150a 100644
--- a/writerfilter/source/resourcemodel/qnametostrcore.cxx
+++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx
@@ -36,7 +36,7 @@ string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC QNameToString::operator()(Id qName)
string sResult;
Map::const_iterator aIt = mMap.find(qName);
-
+
if (aIt != mMap.end())
sResult = aIt->second;
More information about the Libreoffice-commits
mailing list