[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 3 commits - bridges/test configure.ac connectivity/source cui/source dbaccess/source desktop/win32 drawinglayer/source extensions/workben filter/source framework/inc include/basebmp include/comphelper include/tools include/ucbhelper include/xmloff jurt/com jvmfwk/plugins odk/examples offapi/com sal/osl sax/source sax/test sc/inc sc/source sd/source sfx2/source slideshow/source smoketest/data solenv/doc solenv/gcc-wrappers solenv/inc svx/source sw/inc sw/qa sw/source udkapi/com unotools/source vcl/osx vcl/source vcl/unx wizards/source writerfilter/source xmloff/dtd xmloff/source xmlscript/source xmlsecurity/source
Andrea Gelmini
andrea.gelmini at gelma.net
Fri Oct 31 12:45:34 PDT 2014
bridges/test/java_uno/nativethreadpool/readme | 2
configure.ac | 6
connectivity/source/drivers/odbc/ORealDriver.cxx | 2
cui/source/options/fontsubs.cxx | 2
dbaccess/source/ui/app/AppControllerDnD.cxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/misc/UITools.cxx | 2
dbaccess/source/ui/querydesign/QueryTableView.cxx | 2
desktop/win32/source/guistdio/guistdio.inc | 2
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 2
extensions/workben/testcomponent.cxx | 2
filter/source/graphicfilter/ios2met/ios2met.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
framework/inc/classes/filtercachedata.hxx | 2
include/basebmp/bitmapdevice.hxx | 2
include/comphelper/propagg.hxx | 2
include/comphelper/serviceinfohelper.hxx | 2
include/tools/resid.hxx | 4
include/ucbhelper/resultset.hxx | 2
include/xmloff/xmlimp.hxx | 2
jurt/com/sun/star/comp/loader/JavaLoader.java | 2
jurt/com/sun/star/comp/servicemanager/ServiceManager.java | 4
jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java | 2
jurt/com/sun/star/lib/util/UrlToFileMapper.java | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2
odk/examples/java/ToDo/ToDo.java | 2
offapi/com/sun/star/frame/XPopupMenuController.idl | 2
offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl | 2
offapi/com/sun/star/table/AccessibleTableView.idl | 2
sal/osl/w32/profile.cxx | 2
sax/source/expatwrap/sax_expat.cxx | 2
sax/test/saxdemo.cxx | 2
sax/test/testcomponent.cxx | 2
sc/inc/compiler.hxx | 2
sc/inc/formulacell.hxx | 2
sc/source/core/tool/interpr1.cxx | 2
sc/source/ui/vba/vbarange.cxx | 2
sd/source/filter/eppt/epptso.cxx | 2
sd/source/ui/framework/configuration/ConfigurationClassifier.hxx | 2
sfx2/source/control/objface.cxx | 2
slideshow/source/engine/slide/userpaintoverlay.cxx | 2
smoketest/data/Basic/Standard/Test_Ext.xml | 2
solenv/doc/gbuild/doxygen.cfg | 2
solenv/gcc-wrappers/wrapper.cxx | 2
solenv/inc/doxygen.cfg | 2
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 1022 ++++------
svx/source/sdr/contact/viewobjectcontact.cxx | 4
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx | 974 ++++-----
sw/inc/redline.hxx | 6
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 4
sw/source/core/access/acccontext.cxx | 4
sw/source/core/inc/ptqueue.hxx | 2
sw/source/core/inc/rootfrm.hxx | 2
sw/source/core/layout/softpagebreak.cxx | 2
sw/source/core/tox/txmsrt.cxx | 2
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 4
sw/source/uibase/uiview/viewdlg2.cxx | 2
udkapi/com/sun/star/io/XPersistObject.idl | 2
unotools/source/i18n/localedatawrapper.cxx | 2
vcl/osx/DragSource.cxx | 2
vcl/source/app/dbggui.cxx | 2
vcl/unx/kde/kdedata.cxx | 2
wizards/source/depot/tools.xba | 6
wizards/source/gimmicks/GetTexts.xba | 4
wizards/source/tools/UCB.xba | 2
writerfilter/source/dmapper/PropertyMap.cxx | 2
xmloff/dtd/datastyl.mod | 2
xmloff/source/draw/shapeimport.cxx | 2
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 2
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 2
72 files changed, 998 insertions(+), 1166 deletions(-)
New commits:
commit 512cdeb54840796d8b8401961e1b49ab220af667
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Oct 30 12:04:11 2014 +0100
Fixed typos. No automatic tools (sed, and so on).
Change-Id: Ia43976d84eede6f699381bc4f3daf89b95e4cb4f
Reviewed-on: https://gerrit.libreoffice.org/12150
Reviewed-by: Bryan Quigley <gquigs at gmail.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/bridges/test/java_uno/nativethreadpool/readme b/bridges/test/java_uno/nativethreadpool/readme
index 76abefe..f0be4e8 100644
--- a/bridges/test/java_uno/nativethreadpool/readme
+++ b/bridges/test/java_uno/nativethreadpool/readme
@@ -21,7 +21,7 @@ pool as a C++ URP bridge. This test currently only works on Linux Intel.
There are two processes involved. The client starts as a native process. It
first loads a Java component (Relay) via the in-process JNI bridge, which in
-turn starts to accept incomming URP connections. The native part of the client
+turn starts to accept incoming URP connections. The native part of the client
then connects to the server, retrieves a thread-local token from it, and checks
the token for correctness. The server simply waits for a connection from the
native part of the client, creates a connection to the Java part of the client,
diff --git a/configure.ac b/configure.ac
index f05034d..dacfe74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2290,9 +2290,9 @@ AC_ARG_WITH(macosx-sdk,
e. g.: --with-macosx-sdk=10.8
there are 3 options to control the MacOSX build:
- --with-macosx-sdk (refered as 'sdk' below)
- --with-macosx-version-min-required (refered as 'min' below)
- --with-macosx-version-max-allowed (refered as 'max' below)
+ --with-macosx-sdk (referred as 'sdk' below)
+ --with-macosx-version-min-required (referred as 'min' below)
+ --with-macosx-version-max-allowed (referred as 'max' below)
the connection between these value and the default they take is as follow:
( ? means not specified on the command line, s means the SDK version found,
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 6ff10e2..57bac98 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -331,7 +331,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(sal_Int32 _nIndex) const
// ODBC Environment (common for all Connections):
SQLHANDLE ORealObdcDriver::EnvironmentHandle(OUString &_rPath)
{
- // Is (for this instance) already a Enviroment made?
+ // Is (for this instance) already a Environment made?
if (!m_pDriverHandle)
{
SQLHANDLE h = SQL_NULL_HANDLE;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 4668b48..aa488dc 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -244,7 +244,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
{
SvTreeListEntry* pEntry;
// nCol is stupidly the nCol'th text column, not counted!
- // Therefor "0" as column.
+ // Therefore "0" as column.
sal_uLong nPos = m_pCheckLB->GetEntryPos(m_pFont1CB->GetText(), 0);
if (pWin == m_pApply)
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 5957ac8..b32f45b 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -329,7 +329,7 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL
// because every access (read *or* write) to m_xDataSourceConnection
// is mutexed.
// See http://www.cs.umd.edu/~pugh/java/memoryModel/DoubleCheckedLocking.html
- // for what I'm refering to.
+ // for what I'm referring to.
// We cannot use the TLS (thread-local storage) solution
// since support for TLS is not up to the snuff on Windows :-(
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 4e03551..35e1ee9 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -179,7 +179,7 @@ namespace dbaui
// the catalog entry
SvTreeListEntry* pCatalog = m_pTablesList->GetEntryPosByName(sCatalog, pRootEntry);
if (!(pCatalog || sCatalog.isEmpty()))
- // the table (resp. its catalog) refered in this filter entry does not exist anymore
+ // the table (resp. its catalog) referred in this filter entry does not exist anymore
continue;
if (bAllSchemas && pCatalog)
@@ -191,7 +191,7 @@ namespace dbaui
// the schema entry
SvTreeListEntry* pSchema = m_pTablesList->GetEntryPosByName(sSchema, (pCatalog ? pCatalog : pRootEntry));
if (!(pSchema || sSchema.isEmpty()))
- // the table (resp. its schema) refered in this filter entry does not exist anymore
+ // the table (resp. its schema) referred in this filter entry does not exist anymore
continue;
if (bAllTables && pSchema)
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 83f6ac0..392dd7a 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1189,7 +1189,7 @@ TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo)
// such auto increment column later on
// so until we know how to do it, we create a column without autoincrement
// if ( !aIter->second->bAutoIncrement )
- { // therefor we have searched
+ { // therefore we have searched
if ( aIter->second->nType == DataType::INTEGER )
{
pTypeInfo = aIter->second; // alternative
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index a12731c..e3e92e2 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -209,7 +209,7 @@ namespace
// now add the Conn itself
OQueryTableConnection aNewConn(_pView, aNewConnData);
- // refering to the local variable is not important, as NotifyQueryTabConn creates a new copy
+ // referring to the local variable is not important, as NotifyQueryTabConn creates a new copy
// to add me (if not existent)
_pView->NotifyTabConnection(aNewConn, false);
// don't create an Undo-Action for the new connection : the connection is
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 47cf9b0..f918807 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -194,7 +194,7 @@ DWORD WINAPI InputThread( LPVOID pParam )
//there could be more input coming. But if we read from the console
//and the console input fits exactly in the buffer, then the next
//ReadFile would block until the users presses return, etc.
- //Therefor we check if last character is a new line.
+ //Therefore we check if last character is a new line.
//To test this, set dwBufferSize to 4 and enter "no". This should produce
//4 bytes with most code pages.
if ( readAll == lastBufSize
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 9a74fbb..ddbc224 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -197,7 +197,7 @@ namespace drawinglayer
aNewLineGeometry.append(aReducedLoops);
// to create vertical edges at non-C1/C2 steady loops, use maCorrectedPolyPolygon
- // directly since the 3D Polygons do not suport this.
+ // directly since the 3D Polygons do not support this.
//
// Unfortunately there is no bezier polygon provided by the chart module; one reason is
// that the API for extrude wants a 3D polygon geometry (for historical reasons, i guess)
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index bf79852..721d2b0 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -23,7 +23,7 @@
// Expands the dll-names depending on the actual environment.
// Example : testcomponent com.sun.star.io.Pipe stm
-// Therefor the testcode must exist in teststm and the testservice must be named test.com.sun.star.io.Pipe
+// Therefore the testcode must exist in teststm and the testservice must be named test.com.sun.star.io.Pipe
#include <stdio.h>
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index f3b61dc..2bb22cb 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2220,7 +2220,7 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen)
for (i=0; i<nColTabSize; i++) (p->pBMP)->WriteUInt32( GetPalette0RGB(i) );
}
}
- // OK, now the map data is being pushed. Unfortunatly OS2 and BMP
+ // OK, now the map data is being pushed. Unfortunately OS2 and BMP
// do have a different RGB ordering when using 24-bit
boost::scoped_array<sal_uInt8> pBuf(new sal_uInt8[nDataLen]);
pOS2MET->Read(pBuf.get(),nDataLen);
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index bd047f6..33dd1e5 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5706,7 +5706,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
---------------------------------
remembering the Shape-Ids and the associated Blip-Numbers und TextBox-Infos
========= ============ =============
- and remebering the File-Offsets for each Blip
+ and remembering the File-Offsets for each Blip
============
******************************************************************************/
void SvxMSDffManager::GetCtrlData( sal_uInt32 nOffsDgg_ )
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 9563878..c490d11 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -368,7 +368,7 @@ class PerformanceHash : public ::boost::unordered_map< OUString
{
public:
- // try to free all used memory REALY!
+ // try to free all used memory REALLY!
inline void free()
{
diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 1a81514..bcf3648 100644
--- a/include/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
@@ -698,7 +698,7 @@ BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVe
This method creates a second bitmap device instance, which renders
to the same memory as the original, with the same pixel coordinate
- pairs refering to the same pixels in the memory buffer, but with
+ pairs referring to the same pixels in the memory buffer, but with
rendering clipped to a rectangular area. Useful to implement
rectangular clips (usually faster than setting up a 1bpp clip
mask).
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index a5c2659..bbbe3e9 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -111,7 +111,7 @@ public:
If one of the properties returned from the info service conflict with other handles
alread present (e.g. through _rProperties), the property is handled as if -1 was returned.
If NULL (or, for a special property, a call to getPreferredPropertyId returns -1),
- the aggregate property(ies) get a new handle which they can be refered by from outside.
+ the aggregate property(ies) get a new handle which they can be referred by from outside.
@param _nFirstAggregateId
if the object is about to create new handles for the aggregate properties, it uses
id's ascending from this given id.
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index b9bbcbe..09ae3f2 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -25,7 +25,7 @@
namespace comphelper {
-/** this class provides a basic helper for classes suporting the XServiceInfo Interface.
+/** this class provides a basic helper for classes supporting the XServiceInfo Interface.
*
* you can overload the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
* you can use the static helper methods to combine your services with that of parent
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index 0966b3b..07976f7 100644
--- a/include/tools/resid.hxx
+++ b/include/tools/resid.hxx
@@ -47,7 +47,7 @@ class ResId
mutable sal_uInt32 m_nResId; // Resource Identifier
mutable RESOURCE_TYPE m_nRT; // type for loading (mutable to be set later)
mutable ResMgr * m_pResMgr; // load from this ResMgr (mutable for setting on demand)
- mutable RESOURCE_TYPE m_nRT2; // type for loading (supercedes m_nRT)
+ mutable RESOURCE_TYPE m_nRT2; // type for loading (supersedes m_nRT)
mutable sal_uInt32 m_nWinBits; // container for original style bits on a window in a resource
void ImplInit( sal_uInt32 nId, ResMgr& rMgr, RSHEADER_TYPE* pRes )
@@ -104,7 +104,7 @@ public:
/** Get the effective type (m_nRT2 or m_nRT1)
- A second resource type is used to supercede settings
+ A second resource type is used to supersede settings
of the base class ( e.g. Window )
*/
RESOURCE_TYPE GetRT2() const
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 85ed100..4646e62 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -502,7 +502,7 @@ public:
* This method returns the total count of objects in the logical data array
* of the supplier. The implementation of this method may be very
* "expensive", because it can be necessary to obtain all data in order
- * to determine the count. Therefor the ResultSet implementation calls
+ * to determine the count. Therefore the ResultSet implementation calls
* it very seldom.
*
* @return the total count of objects; will always be non-negative.
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 4e801f9..43afbea 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -411,7 +411,7 @@ public:
SAL_DLLPRIVATE ::xmloff::RDFaImportHelper & GetRDFaImportHelper();
// #i31958# XForms helper method
- // (to be implemented by applications suporting XForms)
+ // (to be implemented by applications supporting XForms)
virtual void initXForms();
/** returns the upd and build id (f.e. "680m124$Build-8964" gives rMaster = 680 and rBuild = 8964)
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index fb7c6d8..e7af328 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -50,7 +50,7 @@ import com.sun.star.uno.AnyConverter;
* The <code>JavaLoader</code> class provides the functionality of the
* <code>com.sun.star.loader.Java</code> service.
*
- * <p>Therefor the <code>JavaLoader</code> activates external UNO components
+ * <p>Therefore the <code>JavaLoader</code> activates external UNO components
* which are implemented in Java.</p>
*
* <p>The loader is used by the <code>ServiceManger</code>.</p>
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 85f69fd..6bb0bf5 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -93,7 +93,7 @@ public class ServiceManager implements XMultiServiceFactory,
/**
* Creates a new instance of a specified service.
*
- * <p>Therefor the associated factory of the service is looked up and used
+ * <p>Therefore the associated factory of the service is looked up and used
* to instanciate a new component. </p>
*
* @param serviceSpecifier indicates the service or component name.
@@ -111,7 +111,7 @@ public class ServiceManager implements XMultiServiceFactory,
/**
* Creates a new instance of a specified service with the given parameters.
*
- * <p>Therefor the associated factory of the service is looked up and used
+ * <p>Therefore the associated factory of the service is looked up and used
* to instanciate a new component.</p>
*
* @return newly created component.
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 2e7d021..c9473ea 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -64,7 +64,7 @@ import com.sun.star.uno.Any;
/**
* This class implements a remote bridge.
*
- * <p>Therefor various interfaces are implemented.</p>
+ * <p>Therefore various interfaces are implemented.</p>
*
* <p>The protocol to used is passed by name, the bridge
* then looks for it under <code>com.sun.star.lib.uno.protocols</code>.</p>
diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
index 3380992..394eec3 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
@@ -57,7 +57,7 @@ public final class UrlToFileMapper {
return null;
}
} catch (URISyntaxException ex) {
- throw new RuntimeException(ex); // should never happend
+ throw new RuntimeException(ex); // should never happen
}
}
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index eb840b6..1000ccf 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -699,7 +699,7 @@ void bubbleSortVersion(vector<rtl::Reference<VendorBase> >& vec)
}
catch (MalformedVersionException & )
{
- //The second version is invalid, therefor it is regardes less.
+ //The second version is invalid, therefore it is regardes less.
nCmp = 1;
}
}
diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index de80b92..af518ad 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -453,7 +453,7 @@ public class ToDo {
ToDoImpl.INT_COLUMN_STARTDATE );
}
- // Get the GregorianCalender format for the
+ // Get the GregorianCalendar format for the
// start date
gregCalPreviousStartDate =
this.getGregorianCalendarFromString(
diff --git a/offapi/com/sun/star/frame/XPopupMenuController.idl b/offapi/com/sun/star/frame/XPopupMenuController.idl
index d250a4c..89c354a 100644
--- a/offapi/com/sun/star/frame/XPopupMenuController.idl
+++ b/offapi/com/sun/star/frame/XPopupMenuController.idl
@@ -55,7 +55,7 @@ interface XPopupMenuController : com::sun::star::uno::XInterface
<p>A controller should <b>never</b> update the pop-up menu structure on its
own to prevent performance problems. A better way would be that a controller
registers itself as status listener to for a command URL and immediately
- deregister after that. Therefor status updates will not be send regularly
+ deregister after that. Therefore status updates will not be send regularly
for a non visible pop-up menu.
</p>
*/
diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
index f260873..86422f2 100644
--- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
+++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl
@@ -108,7 +108,7 @@ service AccessibleSpreadsheet
/** This interface gives access to any cell that is at least partially
visible on the screen. So this interface gives access to the same
- things like the XAccessibleContext interface. Therefor it use more
+ things like the XAccessibleContext interface. Therefore it use more
usable methods. Also it gives access to some table specific data.
*/
interface ::com::sun::star::accessibility::XAccessibleTable;
diff --git a/offapi/com/sun/star/table/AccessibleTableView.idl b/offapi/com/sun/star/table/AccessibleTableView.idl
index 9ec9721..8344368 100644
--- a/offapi/com/sun/star/table/AccessibleTableView.idl
+++ b/offapi/com/sun/star/table/AccessibleTableView.idl
@@ -114,7 +114,7 @@ service AccessibleTableView
/** This interface gives access to any cell that is at least partially
visible on the screen. So this interface gives access to the same
- things like the XAccessibleContext interface. Therefor it use more
+ things like the XAccessibleContext interface. Therefore it use more
usable methods. Also it gives access to some table specific data.
*/
interface ::com::sun::star::accessibility::XAccessibleTable;
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 112b70e..1a0de62 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -2197,7 +2197,7 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str
}
/* if we have an userid option eg. "-userid:rh[/usr/home/rh/staroffice]",
- this will supercede all other locations */
+ this will supersede all other locations */
{
sal_uInt32 n, nArgs = osl_getCommandArgCount();
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 78906eb..8a2c0c5 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -211,7 +211,7 @@ public: // module scope
// Exception cannot be thrown through the C-XmlParser (possible resource leaks),
- // therefor the exception must be saved somewhere.
+ // therefore the exception must be saved somewhere.
SAXParseException exception;
css::uno::RuntimeException rtexception;
bool bExceptionWasThrown;
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 0c1ec2f..392ffc6 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -22,7 +22,7 @@
// Expands the dll-names depending on the actual environment.
// Example : testcomponent com.sun.star.io.Pipe stm
-// Therefor the testcode must exist in teststm and the testservice must be named test.com.sun.star.uno.io.Pipe
+// Therefore the testcode must exist in teststm and the testservice must be named test.com.sun.star.uno.io.Pipe
#include <stdio.h>
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index b979603..d2b16d0 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -22,7 +22,7 @@
// Expands the dll-names depending on the actual environment.
// Example : testcomponent com.sun.star.io.Pipe stm
-// Therefor the testcode must exist in teststm and the testservice must be named com.sun.star.io.Pipe
+// Therefore the testcode must exist in teststm and the testservice must be named com.sun.star.io.Pipe
#include <stdio.h>
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 18d788a..ce11756 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -119,7 +119,7 @@ public:
struct ScRawToken: private ScRawTokenBase
{
friend class ScCompiler;
- // Friends that use a temporary ScRawToken on the stack (and therefor need
+ // Friends that use a temporary ScRawToken on the stack (and therefore need
// the private dtor) and know what they're doing..
friend class ScTokenArray;
static sal_uInt16 sbyteOffset();
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 98bfcba..b65504e 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -183,7 +183,7 @@ public:
/** With formula string and grammar to compile with.
formula::FormulaGrammar::GRAM_DEFAULT effectively isformula::FormulaGrammar::GRAM_NATIVE_UI that
- also includes formula::FormulaGrammar::CONV_UNSPECIFIED, therefor uses the address
+ also includes formula::FormulaGrammar::CONV_UNSPECIFIED, therefore uses the address
convention associated with rPos::nTab by default. */
ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos,
const OUString& rFormula,
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 358dab0..2baa906 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6834,7 +6834,7 @@ void ScInterpreter::ScDBCount()
{ // count all matching records
// TODO: currently the QueryIterators only return cell pointers of
// existing cells, so if a query matches an empty cell there's
- // nothing returned, and therefor not counted!
+ // nothing returned, and therefore not counted!
// Since this has ever been the case and this code here only came
// into existence to fix #i6899 and it never worked before we'll
// have to live with it until we reimplement the iterators to also
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 04b71d2..ebfad21 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3980,7 +3980,7 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
}
return;
}
- double nHeight = 0; // Incomming height is in points
+ double nHeight = 0; // Incoming height is in points
_rowheight >>= nHeight;
nHeight = lcl_Round2DecPlaces( nHeight );
RangeHelper thisRange( mxRange );
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index eef8ac7..dc0a6fc 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -420,7 +420,7 @@ bool PPTWriter::ImplCloseDocument()
mpExEmbed->Seek( STREAM_SEEK_TO_END );
sal_uInt32 nExEmbedSize = mpExEmbed->Tell();
- // nEnviroment : whole size of the environment container
+ // nEnvironment : whole size of the environment container
sal_uInt32 nEnvironment = maFontCollection.GetCount() * 76 // 68 bytes per Fontenityatom and 8 Bytes per header
+ 8 // 1 FontCollection container
+ 20 // SrKinsoku container
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index 93340b7..b74a448 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -113,7 +113,7 @@ private:
/** Put all the elements in the two given sequences of resource ids and
copy them into one of the resource id result vectors maC1minusC2,
maC2minusC1, and maC1andC2. This is done by using only the resource
- URLs for classification. Therefor this method calls itself
+ URLs for classification. Therefore this method calls itself
recursively.
@param rS1
One sequence of XResourceId objects.
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 6c26370..101033c 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -188,7 +188,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
}
else if ( 0 == pIter->GetNextSlot() )
{
- // Slots refering in circle to the next with the same
+ // Slots referring in circle to the next with the same
// Status method.
SfxSlot *pLastSlot = pIter;
for ( sal_uInt16 n = nIter; n < Count(); ++n )
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 9f56ae0..9843d48 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -171,7 +171,7 @@ namespace slideshow
{
this->mbIsEraseAllModeActivated= rEraseAllInk;
// if the erase all mode is activated it will remove all ink from slide,
- // therefor destroy all the polygons stored
+ // therefore destroy all the polygons stored
if(mbIsEraseAllModeActivated)
{
// The Erase Mode should be desactivated
diff --git a/smoketest/data/Basic/Standard/Test_Ext.xml b/smoketest/data/Basic/Standard/Test_Ext.xml
index 2984ff6..a46449a 100644
--- a/smoketest/data/Basic/Standard/Test_Ext.xml
+++ b/smoketest/data/Basic/Standard/Test_Ext.xml
@@ -85,7 +85,7 @@ Sub TestExtensions
'Try to create the service which is contained in the now removed extension.
oTestExtension = createUnoService(cUnoSmoketestTestExtension)
- 'The service must not be available anymore. Therefor isNull must return true.
+ 'The service must not be available anymore. Therefore isNull must return true.
LogTestResult( "Extension "+ cMessageExtensionUninstall, IsNull (oTestExtension) )
Print #LocalTestLog, "---"
diff --git a/solenv/doc/gbuild/doxygen.cfg b/solenv/doc/gbuild/doxygen.cfg
index aee40c7..7671444 100644
--- a/solenv/doc/gbuild/doxygen.cfg
+++ b/solenv/doc/gbuild/doxygen.cfg
@@ -913,7 +913,7 @@ HTML_STYLESHEET =
# user-defined cascading style sheet that is included after the standard
# style sheets created by doxygen. Using this option one can overrule
# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
+# since it does not replace the standard style sheet and is therefore more
# robust against future updates. Doxygen will copy the style sheet file to
# the output directory.
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 1b8d562..918a9b5 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -199,7 +199,7 @@ int startprocess(string command, string args) {
NULL, // Thread Handle not Inheritable
TRUE, // Handles are Inherited
0, // No creation flags
- NULL, // Enviroment for process
+ NULL, // Environment for process
NULL, // Use same starting directory
&si, // Startup Info
&pi) // Process Information
diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg
index c501e25..34ffadc 100644
--- a/solenv/inc/doxygen.cfg
+++ b/solenv/inc/doxygen.cfg
@@ -916,7 +916,7 @@ HTML_STYLESHEET =
# user-defined cascading style sheet that is included after the standard
# style sheets created by doxygen. Using this option one can overrule
# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
+# since it does not replace the standard style sheet and is therefore more
# robust against future updates. Doxygen will copy the style sheet file to
# the output directory.
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index f17b4d9..3491cfdf 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -193,7 +193,7 @@ namespace sdr
mpPrimitiveAnimation = 0;
}
- // take care of remebered ObjectContact. Remove from
+ // take care of remembered ObjectContact. Remove from
// OC first. The VC removal (below) CAN trigger a StopGettingViewed()
// which (depending of it's implementation) may destroy other OCs. This
// can trigger the deletion of the helper OC of a page visualising object
@@ -201,7 +201,7 @@ namespace sdr
// to get asynchron later
GetObjectContact().RemoveViewObjectContact(*this);
- // take care of remebered ViewContact
+ // take care of remembered ViewContact
GetViewContact().RemoveViewObjectContact(*this);
}
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 45aff09..fcd48af 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -246,7 +246,7 @@ public:
void SetComment( const OUString& rS ) { pRedlineData->SetComment( rS ); }
- /** ExtraData gets copied, the pointer is therefor not taken over by
+ /** ExtraData gets copied, the pointer is therefore not taken over by
* the RedLineObject.*/
void SetExtraData( const SwRedlineExtraData* pData )
{ pRedlineData->SetExtraData( pData ); }
@@ -316,7 +316,7 @@ public:
SwTableRowRedline(const SwRedlineData& rData, const SwTableLine& rTableLine);
virtual ~SwTableRowRedline();
- /** ExtraData gets copied, the pointer is therefor not taken over by
+ /** ExtraData gets copied, the pointer is therefore not taken over by
* the RedLineObject.*/
void SetExtraData( const SwRedlineExtraData* pData )
{ m_aRedlineData.SetExtraData( pData ); }
@@ -339,7 +339,7 @@ public:
SwTableCellRedline(const SwRedlineData& rData, const SwTableBox& rTableBox);
virtual ~SwTableCellRedline();
- /** ExtraData gets copied, the pointer is therefor not taken over by
+ /** ExtraData gets copied, the pointer is therefore not taken over by
* the RedLineObject.*/
void SetExtraData( const SwRedlineExtraData* pData )
{ m_aRedlineData.SetExtraData( pData ); }
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 7c36ee9..3c11a40 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -693,9 +693,9 @@ DECLARE_OOXMLEXPORT_TEST(testFD083057, "fdo83057.docx")
// A fly frame was attached to a para which started with a hint (run) containing an SDT.
// This SDT was handled while exporting the FLYFRAME and also the text of the run.
// So, eventhough the original file had only one sdt in the header, the RT file had two;
- // one for a seperate run as expected, and one incorrectly exported in the alternateContent (FLYFRAME)
+ // one for a separate run as expected, and one incorrectly exported in the alternateContent (FLYFRAME)
- // Assert that the file has only one sdt, in a seperate run
+ // Assert that the file has only one sdt, in a separate run
assertXPath(pXmlDoc, "//w:sdt", 1);
assertXPath(pXmlDoc, "//mc:AlternateContent//w:sdt", 0);
}
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index a0126fc..abb508f 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1110,7 +1110,7 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
!SwAccessibleChild( GetFrm() ).IsVisibleChildrenOnly() )
{
// If the object could have existed before, than there is nothing to do,
- // because no wrapper exists now and therefor no one is interested to
+ // because no wrapper exists now and therefore no one is interested to
// get notified of the movement.
if( rChildFrmOrObj.GetSwFrm() )
{
@@ -1197,7 +1197,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
if( IsShowing( *(GetMap()), rChildFrmOrObj ) )
{
// If the object could have existed before, than there is nothing to do,
- // because no wrapper exists now and therefor no one is interested to
+ // because no wrapper exists now and therefore no one is interested to
// get notified of the movement.
if( bNew || (bVisibleChildrenOnly && !IsShowing( rOldFrm )) )
{
diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx
index 817f2f9..bed8905 100644
--- a/sw/source/core/inc/ptqueue.hxx
+++ b/sw/source/core/inc/ptqueue.hxx
@@ -30,7 +30,7 @@
* Doing this during printing (after having printed one page) is very suitable
* for doing that.
*
- * Invalidating windows directly from the RootFrm::Paint was not a succesful
+ * Invalidating windows directly from the RootFrm::Paint was not a successful
* approach, because the Paint()s arrive at a very unfavourable point in time.
* Triggering an update for all windows after printing each page does not seem
* appropriate either: on the one hand we don't have direct acces to the edit
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index d8761d2..3fa2f4a 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -116,7 +116,7 @@ class SwRootFrm: public SwLayoutFrm
* The macro and class can be found in the SwViewShell. These object can
* be created nested (also for different kinds of Shells). They are
* collected into the Array pCurrShells.
- * Futhermore it can happen that a shell is activated while a curshell
+ * Furthermore it can happen that a shell is activated while a curshell
* object is still 'active'. This one will be entered into pWaitingCurrShell
* and will be activated by the last d'tor of CurrShell.
* One other problem is the destruction of a shell while it is active.
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index 8aa2d78..55b36e5 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -69,7 +69,7 @@ void SwTxtNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
pTab->FindMaster( false )->HasFollowFlowLine() )
{
// Now we have the row which causes a new page,
- // this row is a follow flow line and therefor cannot get
+ // this row is a follow flow line and therefore cannot get
// the soft page break itself.
// Every first content frame of every cell frane in this row
// will get the soft page break
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index d67d2ef..794c46e 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -669,7 +669,7 @@ SwTOXAuthority::SwTOXAuthority( const SwCntntNode& rNd,
sal_uInt16 SwTOXAuthority::GetLevel() const
{
OUString sText(((SwAuthorityField*)m_rField.GetField())->GetFieldText(AUTH_FIELD_AUTHORITY_TYPE));
- //#i18655# the level '0' is the heading level therefor the values are incremented here
+ //#i18655# the level '0' is the heading level therefore the values are incremented here
sal_uInt16 nRet = 1;
if( pTOXIntl->IsNumeric( sText ) )
{
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 4ee7141..68d8b38 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -196,7 +196,7 @@ sal_uLong SwASCIIParser::CallParser()
// default has changed or not. Even a comparison with the
// HTMLi template does not work, because the defaults are
// not copied when a new doc is created. The result of
- // comparing pool defaults therefor would be that the
+ // comparing pool defaults therefore would be that the
// defaults are exported always if the have changed for
// text documents in general. That's not sensible, as well
// as it is not sensible to export them always.
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 4ca61b9..e75701e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1916,7 +1916,7 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, OUString& rStr )
/* References to numbers in Word could be either to a numbered
paragraph or to a chapter number. However Word does not seem to
- have the capability we do, of refering to the chapter number some
+ have the capability we do, of referring to the chapter number some
other bookmark is in. As a result, cross-references to chapter
numbers in a word document will be cross-references to a numbered
paragraph, being the chapter heading paragraph. As it happens, our
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3f3fd8f..d1a6d57 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2345,9 +2345,9 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
if (pULSpaceItem)
{
// Word positioned tables can have a position (like a
- // fly-frame), but they also support flowing accross multiple
+ // fly-frame), but they also support flowing across multiple
// pages. If we decide to import this as a normal table (so it
- // can flow accross multiple pages), then turn the vertical
+ // can flow across multiple pages), then turn the vertical
// orientation position of the fly into a table upper margin.
const SfxPoolItem* pItem = 0;
if (aFlySet.HasItem(RES_VERT_ORIENT, &pItem))
diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx
index 2af636f..e3edf28 100644
--- a/sw/source/uibase/uiview/viewdlg2.cxx
+++ b/sw/source/uibase/uiview/viewdlg2.cxx
@@ -184,7 +184,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt)
rSh.EnterSelFrmMode();
}
- // rember category
+ // remember category
if (eType & nsSelectionType::SEL_GRF)
SetOldGrfCat(rName);
else if( eType & nsSelectionType::SEL_TBL)
diff --git a/udkapi/com/sun/star/io/XPersistObject.idl b/udkapi/com/sun/star/io/XPersistObject.idl
index 3f39896..b3b2686 100644
--- a/udkapi/com/sun/star/io/XPersistObject.idl
+++ b/udkapi/com/sun/star/io/XPersistObject.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module io {
write method is called.
<p>
The object needs to be created before it deserializes
- itself again (by using the read method). Therefor it must be
+ itself again (by using the read method). Therefore it must be
createable by name via a factory, which is in general
the global service manager. The create and read mechanism
is implemented by the com::sun::star::io::ObjectInputStream.
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index e066117..09a9994 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -300,7 +300,7 @@ void LocaleDataWrapper::invalidateData()
// and default for Language found.
if ( areChecksEnabled()
&& aDebugLocale != "ar-SD" // Sudan/ar
- && aDebugLocale != "en-CB" // Carribean is not a country
+ && aDebugLocale != "en-CB" // Caribbean is not a country
// && aDebugLocale != "en-BG" // ?!? Bulgaria/en
// && aDebugLocale != "es-BR" // ?!? Brazil/es
)
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 0231f12..b76dea2 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -177,7 +177,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
/* All SalFrameView the base class for all VCL system views inherits from
NSView in order to get mouse and other events. This is the only way to
get these events. In order to start a drag operation we need to provide
- the mouse event which was the trigger. SalFrameView therefor implements
+ the mouse event which was the trigger. SalFrameView therefore implements
a hook mechanism so that we can get mouse events for our purpose.
*/
if (![mView respondsToSelector: @selector(registerMouseEventListener:)] ||
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 85b4528..90b5280 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -127,7 +127,7 @@ static const sal_Char* pDbgHelpText[] =
"copies the text of the MessageBox to the clipboard. Because a MessageBox allows "
"further event processing other errors caused by Paint, Activate/Deactivate, "
"GetFocus/LoseFocus can cause more errors or incorrect errors and messages. "
-"Therefor the message should also be directed to a file/debugger in case of "
+"Therefore the message should also be directed to a file/debugger in case of "
"problems in order to produce the (right) error messages.\n",
"\n",
"TestTool\n",
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 9ec9a280..8af9686 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -87,7 +87,7 @@ KDEXLib::~KDEXLib()
{
// on 64 bit linux using libXRandr.so.2 will crash in
// XCloseDisplay when freeing extension data
- // no known work around, therefor currently leak. Hopefully
+ // no known work around, therefore currently leak. Hopefully
// this does not make problems since we're shutting down anyway
// should we ever get a real kde plugin that uses the KDE event loop
// we should use kde's method to signal screen changes similar
diff --git a/wizards/source/depot/tools.xba b/wizards/source/depot/tools.xba
index c1d5812..daadf49 100644
--- a/wizards/source/depot/tools.xba
+++ b/wizards/source/depot/tools.xba
@@ -138,7 +138,7 @@ End Sub
' Updates the cell with the CurrentValue after checking if the
-' Newdate is later than the one that is refered to in the annotation
+' Newdate is later than the one that is referred to in the annotation
' of the cell
Sub InsertCurrentValue(CurValue as Double, iRow as Integer, Newdate as Date)
Dim oCell as Object
@@ -207,11 +207,11 @@ Dim iLastRow as Integer
End Function
-Function CheckDocLocale(LocLanguage as String, LocCountry as String)
+Function CheckDocLocale(LocLanguage as String, LocCountry as String)
Dim bIsDocLanguage as Boolean
Dim bIsDocCountry as Boolean
bIsDocLanguage = Instr(1, LocLanguage, sDocLanguage, SBBINARY) <> 0
bIsDocCountry = Instr(1, LocCountry, sDocCountry, SBBINARY) <> 0 OR SDocCountry = ""
CheckDocLocale = (bIsDocLanguage And bIsDocCountry)
End Function
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/gimmicks/GetTexts.xba b/wizards/source/gimmicks/GetTexts.xba
index 53d4675..9d3dec3 100644
--- a/wizards/source/gimmicks/GetTexts.xba
+++ b/wizards/source/gimmicks/GetTexts.xba
@@ -22,7 +22,7 @@
' This Macro extracts the Strings out of the currently activated document und inserts them into a logdocument
' The aim of the macro is to provide the programmer an insight into the StarOffice API
' It focusses on how document-Objects are accessed.
-' Therefor not only texts of the document-body are retrieved but also Texts of general
+' Therefore not only texts of the document-body are retrieved but also Texts of general
' document Objects like, Annotations, charts and general Document Information
Public oLogDocument, oLogText, oLogCursor, oLogHeaderStyle, oLogBodyTextStyle as Object
@@ -200,7 +200,7 @@ Dim oCell as Object
oPara = ParaEnum.NextElement
' Note: The Enumeration ParaEnum lists all tables and Paragraphs.
- ' Therefor we have to find out what kind of object "oPara" actually is
+ ' Therefore we have to find out what kind of object "oPara" actually is
If oPara.supportsService("com.sun.star.text.Paragraph") Then
' "oPara" is a Paragraph
oTextPortEnum = oPara.createEnumeration
diff --git a/wizards/source/tools/UCB.xba b/wizards/source/tools/UCB.xba
index e3b1323..ed1ae1c 100644
--- a/wizards/source/tools/UCB.xba
+++ b/wizards/source/tools/UCB.xba
@@ -90,7 +90,7 @@ Dim sFileArray(StartUbound,1) as String
' Retrieve the Index in the Array, where a Filename is positioned
If Not IsMissing(sFileContent()) Then
If (FieldinArray(sFileContent(), Ubound(sFileContent), RealFileContent)) Then
- ' The extension of the current file passes the filter and is therefor admitted to the
+ ' The extension of the current file passes the filter and is therefore admitted to the
' fileList
If Not IsMissing(sExtension) Then
If sExtension <> "" Then
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 90c7fd0..7836722 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1329,7 +1329,7 @@ void SectionPropertyMap::_ApplyProperties(
beans::PropertyValue* pCharGrabBag = std::find_if(vPropVals.begin(),vPropVals.end(),NamedPropertyValue("CharInteropGrabBag") );
if (pCharGrabBag!=vPropVals.end()) {
(pCharGrabBag->Value)>>=vCharVals;
- nProperties += vCharVals.getLength()-1; //-1 to accomodate for grab bag property in vPropVals
+ nProperties += vCharVals.getLength()-1; //-1 to accommodate for grab bag property in vPropVals
}
beans::PropertyValue* pParaGrabBag = std::find_if(vPropVals.begin(),vPropVals.end(),NamedPropertyValue("ParaInteropGrabBag") );
if (pParaGrabBag!=vPropVals.end()) {
diff --git a/xmloff/dtd/datastyl.mod b/xmloff/dtd/datastyl.mod
index ed39d03..ea44007 100644
--- a/xmloff/dtd/datastyl.mod
+++ b/xmloff/dtd/datastyl.mod
@@ -94,7 +94,7 @@
<!ATTLIST number:boolean-style style:name %styleName; #REQUIRED>
<!ATTLIST number:text-style style:name %styleName; #REQUIRED>
-<!-- The style:family is redundant and therefor should not exist at all -->
+<!-- The style:family is redundant and therefore should not exist at all -->
<!-- Since OOo 1.0/1.1 is exporting this attribute is is an #IMPLIED -->
<!-- one to avoid validation errors. -->
<!ATTLIST number:number-style style:family CDATA #IMPLIED>
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 29d768d..2d311d5 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -100,7 +100,7 @@ struct XMLShapeImportHelperImpl
std::vector<ConnectionHint> maConnections;
- // #88546# possibility to swich progress bar handling on/off
+ // #88546# possibility to switch progress bar handling on/off
bool mbHandleProgressBar;
// stores the capability of the current model to create presentation shapes
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index a2765da..cbd5ab0 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -1019,7 +1019,7 @@ void ElementDescriptor::readDefaults( bool supportPrintable, bool supportVisible
// In the future VBA support might require custom models ( and not the just the form
// variant of a control that we currently use ) In this case the door is still open,
// we just need to define a new way for the 'ServiceName' to be extracted from the
- // incomming model. E.g. the use of supporting service
+ // incoming model. E.g. the use of supporting service
// "com.sun.star.form.FormComponent", 'ServiceName' and XPersistObject
// is only an implementation detail here, in the future some other
// method ( perhaps a custom prop ) could be used instead.
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 33adcd1..8ae1816 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -238,7 +238,7 @@ OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponen
//ATTENTION: DO NOT call this function directly instead use initNSS
//return true - whole initialization was successful
//param out_nss_init = true: at least the NSS initialization (NSS_InitReadWrite
-//was successful and therefor NSS_Shutdown should be called when terminating.
+//was successful and therefore NSS_Shutdown should be called when terminating.
bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContext > &rxContext, bool & out_nss_init )
{
bool return_value = true;
commit e8e76bb8626ef3bbebc566efe3ebc6572de505a1
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Fri Oct 31 15:32:27 2014 -0400
Remove repetitive namespace close / re-open & unindent.
Change-Id: I453084b3b034a04305058da404b334c7016559ce
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 43f3f09..4ca35ba 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -32,687 +32,601 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <sdr/primitive2d/sdrprimitivetools.hxx>
+using namespace com::sun::star;
+namespace sdr { namespace contact {
-using namespace com::sun::star;
+const SdrPage& ViewObjectContactOfPageSubObject::getPage() const
+{
+ return static_cast< ViewContactOfPageSubObject& >(GetViewContact()).getPage();
+}
+ViewObjectContactOfPageSubObject::ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContact(rObjectContact, rViewContact)
+{
+}
+ViewObjectContactOfPageSubObject::~ViewObjectContactOfPageSubObject()
+{
+}
-namespace sdr
+bool ViewObjectContactOfPageSubObject::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
{
- namespace contact
+ if(rDisplayInfo.GetSubContentActive())
{
- const SdrPage& ViewObjectContactOfPageSubObject::getPage() const
- {
- return static_cast< ViewContactOfPageSubObject& >(GetViewContact()).getPage();
- }
+ return false;
+ }
- ViewObjectContactOfPageSubObject::ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContact(rObjectContact, rViewContact)
- {
- }
+ if(rDisplayInfo.GetControlLayerProcessingActive())
+ {
+ return false;
+ }
- ViewObjectContactOfPageSubObject::~ViewObjectContactOfPageSubObject()
- {
- }
+ if(!rDisplayInfo.GetPageProcessingActive())
+ {
+ return false;
+ }
- bool ViewObjectContactOfPageSubObject::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(rDisplayInfo.GetSubContentActive())
- {
- return false;
- }
+ if(GetObjectContact().isOutputToPrinter())
+ {
+ return false;
+ }
- if(rDisplayInfo.GetControlLayerProcessingActive())
- {
- return false;
- }
+ if(!GetObjectContact().TryToGetSdrPageView())
+ {
+ return false;
+ }
- if(!rDisplayInfo.GetPageProcessingActive())
- {
- return false;
- }
+ return true;
+}
- if(GetObjectContact().isOutputToPrinter())
- {
- return false;
- }
+bool ViewObjectContactOfPageSubObject::isPrimitiveGhosted(const DisplayInfo& /*rDisplayInfo*/) const
+{
+ // suppress ghosted for page parts
+ return false;
+}
- if(!GetObjectContact().TryToGetSdrPageView())
- {
- return false;
- }
+ViewObjectContactOfPageBackground::ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
- return true;
- }
+ViewObjectContactOfPageBackground::~ViewObjectContactOfPageBackground()
+{
+}
- bool ViewObjectContactOfPageSubObject::isPrimitiveGhosted(const DisplayInfo& /*rDisplayInfo*/) const
- {
- // suppress ghosted for page parts
- return false;
- }
- } // end of namespace contact
-} // end of namespace sdr
+bool ViewObjectContactOfPageBackground::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+ {
+ return false;
+ }
+ // no page background for preview renderers
+ if(GetObjectContact().IsPreviewRenderer())
+ {
+ return false;
+ }
+ return true;
+}
-namespace sdr
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageBackground::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
{
- namespace contact
+ // Initialize background. Dependent of IsPageVisible, use ApplicationBackgroundColor or ApplicationDocumentColor. Most
+ // old renderers for export (html, pdf, gallery, ...) set the page to not visible (SetPageVisible(false)). They expect the
+ // given OutputDevice to be initialized with the ApplicationDocumentColor then.
+ const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+ drawinglayer::primitive2d::Primitive2DSequence xRetval;
+
+ if(pPageView)
{
- ViewObjectContactOfPageBackground::ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
+ const SdrView& rView = pPageView->GetView();
+ Color aInitColor;
- ViewObjectContactOfPageBackground::~ViewObjectContactOfPageBackground()
+ if(rView.IsPageVisible())
{
+ aInitColor = pPageView->GetApplicationBackgroundColor();
}
-
- bool ViewObjectContactOfPageBackground::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+ else
{
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
+ aInitColor = pPageView->GetApplicationDocumentColor();
- // no page background for preview renderers
- if(GetObjectContact().IsPreviewRenderer())
+ if(Color(COL_AUTO) == aInitColor)
{
- return false;
+ const svtools::ColorConfig aColorConfig;
+ aInitColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
}
-
- return true;
}
- drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageBackground::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
- {
- // Initialize background. Dependent of IsPageVisible, use ApplicationBackgroundColor or ApplicationDocumentColor. Most
- // old renderers for export (html, pdf, gallery, ...) set the page to not visible (SetPageVisible(false)). They expect the
- // given OutputDevice to be initialized with the ApplicationDocumentColor then.
- const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
- drawinglayer::primitive2d::Primitive2DSequence xRetval;
-
- if(pPageView)
- {
- const SdrView& rView = pPageView->GetView();
- Color aInitColor;
-
- if(rView.IsPageVisible())
- {
- aInitColor = pPageView->GetApplicationBackgroundColor();
- }
- else
- {
- aInitColor = pPageView->GetApplicationDocumentColor();
-
- if(Color(COL_AUTO) == aInitColor)
- {
- const svtools::ColorConfig aColorConfig;
- aInitColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
- }
- }
-
- // init background with InitColor
- xRetval.realloc(1);
- const basegfx::BColor aRGBColor(aInitColor.getBColor());
- xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::BackgroundColorPrimitive2D(aRGBColor));
- }
+ // init background with InitColor
+ xRetval.realloc(1);
+ const basegfx::BColor aRGBColor(aInitColor.getBColor());
+ xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::BackgroundColorPrimitive2D(aRGBColor));
+ }
- return xRetval;
- }
- } // end of namespace contact
-} // end of namespace sdr
+ return xRetval;
+}
+ViewObjectContactOfMasterPage::ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
+ViewObjectContactOfMasterPage::~ViewObjectContactOfMasterPage()
+{
+}
-namespace sdr
+bool ViewObjectContactOfMasterPage::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
{
- namespace contact
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
{
- ViewObjectContactOfMasterPage::ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
+ return false;
+ }
- ViewObjectContactOfMasterPage::~ViewObjectContactOfMasterPage()
- {
- }
+ // this object is only used for MasterPages. When not the MasterPage is
+ // displayed as a page, but another page is using it as sub-object, the
+ // geometry needs to be hidden
+ if(rDisplayInfo.GetSubContentActive())
+ {
+ return false;
+ }
- bool ViewObjectContactOfMasterPage::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
+ return true;
+}
- // this object is only used for MasterPages. When not the MasterPage is
- // displayed as a page, but another page is using it as sub-object, the
- // geometry needs to be hidden
- if(rDisplayInfo.GetSubContentActive())
- {
- return false;
- }
+ViewObjectContactOfPageFill::ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
- return true;
- }
- } // end of namespace contact
-} // end of namespace sdr
+ViewObjectContactOfPageFill::~ViewObjectContactOfPageFill()
+{
+}
+bool ViewObjectContactOfPageFill::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+ {
+ return false;
+ }
+ SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
-namespace sdr
-{
- namespace contact
+ if(!pSdrPageView)
{
- ViewObjectContactOfPageFill::ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
+ return false;
+ }
- ViewObjectContactOfPageFill::~ViewObjectContactOfPageFill()
- {
- }
+ if(!pSdrPageView->GetView().IsPageVisible())
+ {
+ return false;
+ }
- bool ViewObjectContactOfPageFill::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
+ return true;
+}
- SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageFill::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+{
+ const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+ drawinglayer::primitive2d::Primitive2DSequence xRetval;
- if(!pSdrPageView)
- {
- return false;
- }
+ if(pPageView)
+ {
+ const SdrPage& rPage = getPage();
- if(!pSdrPageView->GetView().IsPageVisible())
- {
- return false;
- }
+ const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
+ const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange));
+ Color aPageFillColor;
- return true;
+ if(pPageView->GetApplicationDocumentColor() != COL_AUTO)
+ {
+ aPageFillColor = pPageView->GetApplicationDocumentColor();
}
-
- drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageFill::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+ else
{
- const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
- drawinglayer::primitive2d::Primitive2DSequence xRetval;
-
- if(pPageView)
- {
- const SdrPage& rPage = getPage();
-
- const basegfx::B2DRange aPageFillRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
- const basegfx::B2DPolygon aPageFillPolygon(basegfx::tools::createPolygonFromRect(aPageFillRange));
- Color aPageFillColor;
-
- if(pPageView->GetApplicationDocumentColor() != COL_AUTO)
- {
- aPageFillColor = pPageView->GetApplicationDocumentColor();
- }
- else
- {
- const svtools::ColorConfig aColorConfig;
- aPageFillColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
- }
-
- // create and add primitive
- xRetval.realloc(1);
- const basegfx::BColor aRGBColor(aPageFillColor.getBColor());
- xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor));
- }
-
- return xRetval;
+ const svtools::ColorConfig aColorConfig;
+ aPageFillColor = aColorConfig.GetColorValue(svtools::DOCCOLOR).nColor;
}
- } // end of namespace contact
-} // end of namespace sdr
+ // create and add primitive
+ xRetval.realloc(1);
+ const basegfx::BColor aRGBColor(aPageFillColor.getBColor());
+ xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageFillPolygon), aRGBColor));
+ }
+ return xRetval;
+}
-namespace sdr
+ViewObjectContactOfPageShadow::ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
{
- namespace contact
- {
- ViewObjectContactOfPageShadow::ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
+}
- ViewObjectContactOfPageShadow::~ViewObjectContactOfPageShadow()
- {
- }
+ViewObjectContactOfPageShadow::~ViewObjectContactOfPageShadow()
+{
+}
- bool ViewObjectContactOfPageShadow::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
+bool ViewObjectContactOfPageShadow::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+ {
+ return false;
+ }
- SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+ SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
- if(!pSdrPageView)
- {
- return false;
- }
+ if(!pSdrPageView)
+ {
+ return false;
+ }
- if(!pSdrPageView->GetView().IsPageVisible())
- {
- return false;
- }
+ if(!pSdrPageView->GetView().IsPageVisible())
+ {
+ return false;
+ }
- // no page shadow for preview renderers
- if(GetObjectContact().IsPreviewRenderer())
- {
- return false;
- }
+ // no page shadow for preview renderers
+ if(GetObjectContact().IsPreviewRenderer())
+ {
+ return false;
+ }
- // no page shadow for high contrast mode
- if(GetObjectContact().isDrawModeHighContrast())
- {
- return false;
- }
+ // no page shadow for high contrast mode
+ if(GetObjectContact().isDrawModeHighContrast())
+ {
+ return false;
+ }
- return true;
- }
- } // end of namespace contact
-} // end of namespace sdr
+ return true;
+}
+ViewObjectContactOfOuterPageBorder::ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
+ViewObjectContactOfOuterPageBorder::~ViewObjectContactOfOuterPageBorder()
+{
+}
-namespace sdr
+bool ViewObjectContactOfOuterPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
{
- namespace contact
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
{
- ViewObjectContactOfOuterPageBorder::ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
-
- ViewObjectContactOfOuterPageBorder::~ViewObjectContactOfOuterPageBorder()
- {
- }
-
- bool ViewObjectContactOfOuterPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
+ return false;
+ }
- SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+ SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
- if(!pSdrPageView)
- {
- return false;
- }
+ if(!pSdrPageView)
+ {
+ return false;
+ }
- const SdrView& rView = pSdrPageView->GetView();
+ const SdrView& rView = pSdrPageView->GetView();
- if(!rView.IsPageVisible() && rView.IsPageBorderVisible())
- {
- return false;
- }
+ if(!rView.IsPageVisible() && rView.IsPageBorderVisible())
+ {
+ return false;
+ }
- return true;
- }
- } // end of namespace contact
-} // end of namespace sdr
+ return true;
+}
+ViewObjectContactOfInnerPageBorder::ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
+ViewObjectContactOfInnerPageBorder::~ViewObjectContactOfInnerPageBorder()
+{
+}
-namespace sdr
+bool ViewObjectContactOfInnerPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
{
- namespace contact
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
{
- ViewObjectContactOfInnerPageBorder::ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
+ return false;
+ }
- ViewObjectContactOfInnerPageBorder::~ViewObjectContactOfInnerPageBorder()
- {
- }
+ SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
- bool ViewObjectContactOfInnerPageBorder::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
+ if(!pSdrPageView)
+ {
+ return false;
+ }
- SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+ if(!pSdrPageView->GetView().IsBordVisible())
+ {
+ return false;
+ }
- if(!pSdrPageView)
- {
- return false;
- }
+ const SdrPage& rPage = getPage();
- if(!pSdrPageView->GetView().IsBordVisible())
- {
- return false;
- }
+ if(!rPage.GetLftBorder() && !rPage.GetUppBorder() && !rPage.GetRgtBorder() && !rPage.GetLwrBorder())
+ {
+ return false;
+ }
- const SdrPage& rPage = getPage();
+ // no inner page border for preview renderers
+ if(GetObjectContact().IsPreviewRenderer())
+ {
+ return false;
+ }
- if(!rPage.GetLftBorder() && !rPage.GetUppBorder() && !rPage.GetRgtBorder() && !rPage.GetLwrBorder())
- {
- return false;
- }
+ return true;
+}
- // no inner page border for preview renderers
- if(GetObjectContact().IsPreviewRenderer())
- {
- return false;
- }
+ViewObjectContactOfPageHierarchy::ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
- return true;
- }
- } // end of namespace contact
-} // end of namespace sdr
+ViewObjectContactOfPageHierarchy::~ViewObjectContactOfPageHierarchy()
+{
+}
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
+{
+ drawinglayer::primitive2d::Primitive2DSequence xRetval;
+ // process local sub-hierarchy
+ const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
-namespace sdr
-{
- namespace contact
+ if(nSubHierarchyCount)
{
- ViewObjectContactOfPageHierarchy::ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
+ xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
- ViewObjectContactOfPageHierarchy::~ViewObjectContactOfPageHierarchy()
+ if(xRetval.hasElements())
{
- }
-
- drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHierarchy::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
- {
- drawinglayer::primitive2d::Primitive2DSequence xRetval;
-
- // process local sub-hierarchy
- const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+ // get ranges
+ const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
+ const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
+ const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
- if(nSubHierarchyCount)
+ // check geometrical visibility
+ if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
{
- xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
-
- if(xRetval.hasElements())
- {
- // get ranges
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
- const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
- const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
-
- // check geometrical visibility
- if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
- {
- // not visible, release
- xRetval.realloc(0);
- }
- }
+ // not visible, release
+ xRetval.realloc(0);
}
-
- return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
-
+ }
+ return xRetval;
+}
-namespace sdr
+ViewObjectContactOfPageGrid::ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
{
- namespace contact
- {
- ViewObjectContactOfPageGrid::ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
-
- ViewObjectContactOfPageGrid::~ViewObjectContactOfPageGrid()
- {
- }
+}
- bool ViewObjectContactOfPageGrid::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
-
- SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+ViewObjectContactOfPageGrid::~ViewObjectContactOfPageGrid()
+{
+}
- if(!pSdrPageView)
- {
- return false;
- }
+bool ViewObjectContactOfPageGrid::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
+{
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
+ {
+ return false;
+ }
- const SdrView& rView = pSdrPageView->GetView();
+ SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
- if(!rView.IsGridVisible())
- {
- return false;
- }
+ if(!pSdrPageView)
+ {
+ return false;
+ }
- // no page grid for preview renderers
- if(GetObjectContact().IsPreviewRenderer())
- {
- return false;
- }
+ const SdrView& rView = pSdrPageView->GetView();
- if(static_cast< ViewContactOfGrid& >(GetViewContact()).getFront() != (bool)rView.IsGridFront())
- {
- return false;
- }
+ if(!rView.IsGridVisible())
+ {
+ return false;
+ }
- return true;
- }
+ // no page grid for preview renderers
+ if(GetObjectContact().IsPreviewRenderer())
+ {
+ return false;
+ }
- drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageGrid::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
- {
- const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
- drawinglayer::primitive2d::Primitive2DSequence xRetval;
+ if(static_cast< ViewContactOfGrid& >(GetViewContact()).getFront() != (bool)rView.IsGridFront())
+ {
+ return false;
+ }
- if(pPageView)
- {
- const SdrView& rView = pPageView->GetView();
- const SdrPage& rPage = getPage();
- const Color aGridColor(rView.GetGridColor());
- const basegfx::BColor aRGBGridColor(aGridColor.getBColor());
-
- basegfx::B2DHomMatrix aGridMatrix;
- aGridMatrix.set(0, 0, (double)(rPage.GetWdt() - (rPage.GetRgtBorder() + rPage.GetLftBorder())));
- aGridMatrix.set(1, 1, (double)(rPage.GetHgt() - (rPage.GetLwrBorder() + rPage.GetUppBorder())));
- aGridMatrix.set(0, 2, (double)rPage.GetLftBorder());
- aGridMatrix.set(1, 2, (double)rPage.GetUppBorder());
-
- const Size aRaw(rView.GetGridCoarse());
- const Size aFine(rView.GetGridFine());
- const double fWidthX(aRaw.getWidth());
- const double fWidthY(aRaw.getHeight());
- const sal_uInt32 nSubdivisionsX(aFine.getWidth() ? aRaw.getWidth() / aFine.getWidth() : 0L);
- const sal_uInt32 nSubdivisionsY(aFine.getHeight() ? aRaw.getHeight() / aFine.getHeight() : 0L);
-
- xRetval.realloc(1);
- xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::GridPrimitive2D(
- aGridMatrix, fWidthX, fWidthY, 10.0, 3.0, nSubdivisionsX, nSubdivisionsY, aRGBGridColor,
- drawinglayer::primitive2d::createDefaultCross_3x3(aRGBGridColor)));
- }
+ return true;
+}
- return xRetval;
- }
- } // end of namespace contact
-} // end of namespace sdr
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageGrid::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+{
+ const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+ drawinglayer::primitive2d::Primitive2DSequence xRetval;
+ if(pPageView)
+ {
+ const SdrView& rView = pPageView->GetView();
+ const SdrPage& rPage = getPage();
+ const Color aGridColor(rView.GetGridColor());
+ const basegfx::BColor aRGBGridColor(aGridColor.getBColor());
+
+ basegfx::B2DHomMatrix aGridMatrix;
+ aGridMatrix.set(0, 0, (double)(rPage.GetWdt() - (rPage.GetRgtBorder() + rPage.GetLftBorder())));
+ aGridMatrix.set(1, 1, (double)(rPage.GetHgt() - (rPage.GetLwrBorder() + rPage.GetUppBorder())));
+ aGridMatrix.set(0, 2, (double)rPage.GetLftBorder());
+ aGridMatrix.set(1, 2, (double)rPage.GetUppBorder());
+
+ const Size aRaw(rView.GetGridCoarse());
+ const Size aFine(rView.GetGridFine());
+ const double fWidthX(aRaw.getWidth());
+ const double fWidthY(aRaw.getHeight());
+ const sal_uInt32 nSubdivisionsX(aFine.getWidth() ? aRaw.getWidth() / aFine.getWidth() : 0L);
+ const sal_uInt32 nSubdivisionsY(aFine.getHeight() ? aRaw.getHeight() / aFine.getHeight() : 0L);
+
+ xRetval.realloc(1);
+ xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::GridPrimitive2D(
+ aGridMatrix, fWidthX, fWidthY, 10.0, 3.0, nSubdivisionsX, nSubdivisionsY, aRGBGridColor,
+ drawinglayer::primitive2d::createDefaultCross_3x3(aRGBGridColor)));
+ }
+
+ return xRetval;
+}
+
+ViewObjectContactOfPageHelplines::ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
+{
+}
+ViewObjectContactOfPageHelplines::~ViewObjectContactOfPageHelplines()
+{
+}
-namespace sdr
+bool ViewObjectContactOfPageHelplines::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
{
- namespace contact
+ if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
{
- ViewObjectContactOfPageHelplines::ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContactOfPageSubObject(rObjectContact, rViewContact)
- {
- }
+ return false;
+ }
- ViewObjectContactOfPageHelplines::~ViewObjectContactOfPageHelplines()
- {
- }
+ SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
- bool ViewObjectContactOfPageHelplines::isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const
- {
- if(!ViewObjectContactOfPageSubObject::isPrimitiveVisible(rDisplayInfo))
- {
- return false;
- }
+ if(!pSdrPageView)
+ {
+ return false;
+ }
- SdrPageView* pSdrPageView = GetObjectContact().TryToGetSdrPageView();
+ const SdrView& rView = pSdrPageView->GetView();
- if(!pSdrPageView)
- {
- return false;
- }
+ if(!rView.IsHlplVisible())
+ {
+ return false;
+ }
- const SdrView& rView = pSdrPageView->GetView();
+ // no helplines for preview renderers
+ if(GetObjectContact().IsPreviewRenderer())
+ {
+ return false;
+ }
- if(!rView.IsHlplVisible())
- {
- return false;
- }
+ if(static_cast< ViewContactOfHelplines& >(GetViewContact()).getFront() != (bool)rView.IsHlplFront())
+ {
+ return false;
+ }
- // no helplines for preview renderers
- if(GetObjectContact().IsPreviewRenderer())
- {
- return false;
- }
+ return true;
+}
- if(static_cast< ViewContactOfHelplines& >(GetViewContact()).getFront() != (bool)rView.IsHlplFront())
- {
- return false;
- }
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHelplines::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+{
+ drawinglayer::primitive2d::Primitive2DSequence xRetval;
+ const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
- return true;
- }
+ if(pPageView)
+ {
+ const SdrHelpLineList& rHelpLineList = pPageView->GetHelpLines();
+ const sal_uInt32 nCount(rHelpLineList.GetCount());
- drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageHelplines::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
+ if(nCount)
{
- drawinglayer::primitive2d::Primitive2DSequence xRetval;
- const SdrPageView* pPageView = GetObjectContact().TryToGetSdrPageView();
+ const basegfx::BColor aRGBColorA(1.0, 1.0, 1.0);
+ const basegfx::BColor aRGBColorB(0.0, 0.0, 0.0);
+ xRetval.realloc(nCount);
- if(pPageView)
+ for(sal_uInt32 a(0L); a < nCount; a++)
{
- const SdrHelpLineList& rHelpLineList = pPageView->GetHelpLines();
- const sal_uInt32 nCount(rHelpLineList.GetCount());
+ const SdrHelpLine& rHelpLine = rHelpLineList[(sal_uInt16)a];
+ const basegfx::B2DPoint aPosition((double)rHelpLine.GetPos().X(), (double)rHelpLine.GetPos().Y());
+ const double fDiscreteDashLength(4.0);
- if(nCount)
+ switch(rHelpLine.GetKind())
{
- const basegfx::BColor aRGBColorA(1.0, 1.0, 1.0);
- const basegfx::BColor aRGBColorB(0.0, 0.0, 0.0);
- xRetval.realloc(nCount);
-
- for(sal_uInt32 a(0L); a < nCount; a++)
+ default : // SDRHELPLINE_POINT
{
- const SdrHelpLine& rHelpLine = rHelpLineList[(sal_uInt16)a];
- const basegfx::B2DPoint aPosition((double)rHelpLine.GetPos().X(), (double)rHelpLine.GetPos().Y());
- const double fDiscreteDashLength(4.0);
-
- switch(rHelpLine.GetKind())
- {
- default : // SDRHELPLINE_POINT
- {
- xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
- aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_POINT,
- aRGBColorA, aRGBColorB, fDiscreteDashLength));
- break;
- }
- case SDRHELPLINE_VERTICAL :
- {
- xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
- aPosition, basegfx::B2DVector(0.0, 1.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
- aRGBColorA, aRGBColorB, fDiscreteDashLength));
- break;
- }
- case SDRHELPLINE_HORIZONTAL :
- {
- xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
- aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
- aRGBColorA, aRGBColorB, fDiscreteDashLength));
- break;
- }
- }
+ xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
+ aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_POINT,
+ aRGBColorA, aRGBColorB, fDiscreteDashLength));
+ break;
+ }
+ case SDRHELPLINE_VERTICAL :
+ {
+ xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
+ aPosition, basegfx::B2DVector(0.0, 1.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
+ aRGBColorA, aRGBColorB, fDiscreteDashLength));
+ break;
+ }
+ case SDRHELPLINE_HORIZONTAL :
+ {
+ xRetval[a] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::HelplinePrimitive2D(
+ aPosition, basegfx::B2DVector(1.0, 0.0), drawinglayer::primitive2d::HELPLINESTYLE2D_LINE,
+ aRGBColorA, aRGBColorB, fDiscreteDashLength));
+ break;
}
}
}
-
- return xRetval;
}
- } // end of namespace contact
-} // end of namespace sdr
+ }
+ return xRetval;
+}
+ViewObjectContactOfSdrPage::ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
+: ViewObjectContact(rObjectContact, rViewContact)
+{
+}
-namespace sdr
+ViewObjectContactOfSdrPage::~ViewObjectContactOfSdrPage()
{
- namespace contact
+}
+
+drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
+{
+ drawinglayer::primitive2d::Primitive2DSequence xRetval;
+
+ // process local sub-hierarchy
+ const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+
+ if(nSubHierarchyCount)
{
- ViewObjectContactOfSdrPage::ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact)
- : ViewObjectContact(rObjectContact, rViewContact)
- {
- }
+ const bool bDoGhostedDisplaying(
+ GetObjectContact().DoVisualizeEnteredGroup()
+ && !GetObjectContact().isOutputToPrinter()
+ && GetObjectContact().getActiveViewContact() == &GetViewContact());
- ViewObjectContactOfSdrPage::~ViewObjectContactOfSdrPage()
+ if(bDoGhostedDisplaying)
{
+ rDisplayInfo.ClearGhostedDrawMode();
}
- drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrPage::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
- {
- drawinglayer::primitive2d::Primitive2DSequence xRetval;
+ // create object hierarchy
+ xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
- // process local sub-hierarchy
- const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+ if(xRetval.hasElements())
+ {
+ // get ranges
+ const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
+ const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
+ const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
- if(nSubHierarchyCount)
+ // check geometrical visibility
+ if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
{
- const bool bDoGhostedDisplaying(
- GetObjectContact().DoVisualizeEnteredGroup()
- && !GetObjectContact().isOutputToPrinter()
- && GetObjectContact().getActiveViewContact() == &GetViewContact());
-
- if(bDoGhostedDisplaying)
- {
- rDisplayInfo.ClearGhostedDrawMode();
- }
-
- // create object hierarchy
- xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
-
- if(xRetval.hasElements())
- {
- // get ranges
- const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
- const basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
- const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
-
- // check geometrical visibility
- if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
- {
- // not visible, release
- xRetval.realloc(0);
- }
- }
-
- if(bDoGhostedDisplaying)
- {
- rDisplayInfo.SetGhostedDrawMode();
- }
+ // not visible, release
+ xRetval.realloc(0);
}
+ }
- return xRetval;
+ if(bDoGhostedDisplaying)
+ {
+ rDisplayInfo.SetGhostedDrawMode();
}
- } // end of namespace contact
-} // end of namespace sdr
+ }
+
+ return xRetval;
+}
+
+}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ff128990298d44ce394f1e0d08b3c1313f466ef0
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Fri Oct 31 15:25:09 2014 -0400
We don't need this repetitive namespace open / close thingie...
And unindent to make it look more like C++ than Java.
Change-Id: I67562cf17c32c40c321b492e9b05c2321a51e126
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 04ac457..e1c652b 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -41,673 +41,591 @@
#include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
#include <drawinglayer/attribute/sdrfillattribute.hxx>
+namespace sdr { namespace contact {
-
-namespace sdr
+ViewContactOfPageSubObject::ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage)
+: mrParentViewContactOfSdrPage(rParentViewContactOfSdrPage)
{
- namespace contact
- {
- ViewContactOfPageSubObject::ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage)
- : mrParentViewContactOfSdrPage(rParentViewContactOfSdrPage)
- {
- }
-
- ViewContactOfPageSubObject::~ViewContactOfPageSubObject()
- {
- }
-
- ViewContact* ViewContactOfPageSubObject::GetParentContact() const
- {
- return &mrParentViewContactOfSdrPage;
- }
-
- const SdrPage& ViewContactOfPageSubObject::getPage() const
- {
- return mrParentViewContactOfSdrPage.GetSdrPage();
- }
- } // end of namespace contact
-} // end of namespace sdr
-
+}
+ViewContactOfPageSubObject::~ViewContactOfPageSubObject()
+{
+}
-namespace sdr
+ViewContact* ViewContactOfPageSubObject::GetParentContact() const
{
- namespace contact
- {
- ViewObjectContact& ViewContactOfPageBackground::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact)
- {
- ViewObjectContact* pRetval = new ViewObjectContactOfPageBackground(rObjectContact, *this);
- DBG_ASSERT(pRetval, "ViewContact::CreateObjectSpecificViewObjectContact() failed (!)");
+ return &mrParentViewContactOfSdrPage;
+}
- return *pRetval;
- }
+const SdrPage& ViewContactOfPageSubObject::getPage() const
+{
+ return mrParentViewContactOfSdrPage.GetSdrPage();
+}
- drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageBackground::createViewIndependentPrimitive2DSequence() const
- {
- // We have only the page information, not the view information. Use the
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list