This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5f551de635 Fixed typo (overriden -> overridden) and some others
5f551de635 is described below
commit 5f551de635bbe4c47e985520a47471cf8e391c88
Author: mseidel <[email protected]>
AuthorDate: Sun Apr 30 11:29:00 2023 +0200
Fixed typo (overriden -> overridden) and some others
---
.../inc/comphelper/accessibletexthelper.hxx | 28 ++---
main/forms/source/xforms/collection.hxx | 62 +++++-----
main/offapi/com/sun/star/awt/tree/XTreeControl.idl | 14 +--
.../schema/org/openoffice/Office/UI/Sidebar.xcs | 22 ++--
.../java/ifc/document/_XDocumentInsertable.java | 27 ++---
.../OOoRunner/src/main/java/ifc/sdb/_RowSet.java | 17 ++-
.../src/main/java/lib/MultiMethodTest.java | 13 +-
.../src/main/java/lib/MultiPropertyTest.java | 45 +++----
main/sc/source/ui/unoobj/fmtuno.cxx | 78 ++++++------
.../engine/animationnodes/animationaudionode.hxx | 29 ++---
main/sw/source/filter/ww8/ww8par3.cxx | 133 ++++++++++-----------
main/vcl/win/source/gdi/salgdi_gdiplus.cxx | 73 +++++------
main/vcl/win/source/window/salframe.cxx | 6 +-
main/vos/inc/vos/thread.hxx | 55 +++++----
main/writerfilter/source/doctok/resources.xmi | 12 +-
15 files changed, 305 insertions(+), 309 deletions(-)
diff --git a/main/comphelper/inc/comphelper/accessibletexthelper.hxx
b/main/comphelper/inc/comphelper/accessibletexthelper.hxx
index 50e18285b9..ab7a86ac48 100644
--- a/main/comphelper/inc/comphelper/accessibletexthelper.hxx
+++ b/main/comphelper/inc/comphelper/accessibletexthelper.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -80,22 +80,22 @@ namespace comphelper
::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex(
sal_Int32 nIndex, sal_Int16 aTextType ) throw
(::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
::com::sun::star::accessibility::TextSegment SAL_CALL
getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw
(::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
::com::sun::star::accessibility::TextSegment SAL_CALL
getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw
(::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
-
+
public:
-
+
/** Helper method, that detects the difference between
two strings and returns the deleted selection and
the inserted selection if available.
-
+
@returns true if there are differences between the
two strings and false if both are equal
-
+
@see ::com::sun::star::accessibility::AccessibleEventId
::com::sun::star::accessibility::TextSegment
*/
static bool implInitTextChangedEvent(
- const rtl::OUString& rOldString,
- const rtl::OUString& rNewString,
+ const rtl::OUString& rOldString,
+ const rtl::OUString& rNewString,
/*out*/ ::com::sun::star::uno::Any& rDeleted,
/*out*/ ::com::sun::star::uno::Any& rInserted); // throw()
};
@@ -119,7 +119,7 @@ namespace comphelper
OAccessibleTextHelper();
// see the respective base class ctor for an extensive comment
on this, please
OAccessibleTextHelper( IMutex* _pExternalLock );
-
+
public:
// XInterface
DECLARE_XINTERFACE( )
@@ -149,7 +149,7 @@ namespace comphelper
//
-----------------------------------------------------------------------------
//
-// OAccessibleTextHelper is a helper class for implementing the
+// OAccessibleTextHelper is a helper class for implementing the
// XAccessibleText interface.
//
// The following methods have a default implementation:
@@ -165,7 +165,7 @@ namespace comphelper
// getTextBeforeIndex
// getTextBehindIndex
//
-// The following methods must be overriden by derived classes:
+// The following methods must be overridden by derived classes:
//
// implGetText
// implGetLocale
@@ -177,5 +177,5 @@ namespace comphelper
// getIndexAtPoint
// setSelection
// copyText
-//
+//
//
-----------------------------------------------------------------------------
diff --git a/main/forms/source/xforms/collection.hxx
b/main/forms/source/xforms/collection.hxx
index 3bcdefc119..f18f4cb2fa 100644
--- a/main/forms/source/xforms/collection.hxx
+++ b/main/forms/source/xforms/collection.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -125,12 +125,12 @@ public:
bool isValidIndex( sal_Int32 n ) const
{
- return n >= 0 && n < static_cast<sal_Int32>( maItems.size() );
+ return n >= 0 && n < static_cast<sal_Int32>( maItems.size() );
}
- // the following method may be overriden by sub-classes for
- // customized behaviour
+ // the following method may be overridden by sub-classes for
+ // customized behavior
/// called before insertion to determine whether item is valid
virtual bool isValid( const T& ) const { return true; }
@@ -138,8 +138,8 @@ public:
protected:
- // the following methods may be overriden by sub-classes for
- // customized behaviour
+ // the following methods may be overridden by sub-classes for
+ // customized behavior
/// called after item has been inserted into the collection
virtual void _insert( const T& ) { }
@@ -161,28 +161,28 @@ public:
// XElementAccess
- virtual Type_t SAL_CALL getElementType()
+ virtual Type_t SAL_CALL getElementType()
throw( RuntimeException_t )
{
return getCppuType( static_cast<T*>( NULL ) );
}
- virtual sal_Bool SAL_CALL hasElements()
+ virtual sal_Bool SAL_CALL hasElements()
throw( RuntimeException_t )
{
return hasItems();
}
// XIndexAccess : XElementAccess
- virtual sal_Int32 SAL_CALL getCount()
+ virtual sal_Int32 SAL_CALL getCount()
throw( RuntimeException_t )
{
return countItems();
}
- virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex )
- throw( IndexOutOfBoundsException_t,
- WrappedTargetException_t,
+ virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex )
+ throw( IndexOutOfBoundsException_t,
+ WrappedTargetException_t,
RuntimeException_t)
{
if( isValidIndex( nIndex ) )
@@ -192,16 +192,16 @@ public:
}
// XIndexReplace : XIndexAccess
- virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex,
- const Any_t& aElement )
- throw( IllegalArgumentException_t,
- IndexOutOfBoundsException_t,
- WrappedTargetException_t,
+ virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex,
+ const Any_t& aElement )
+ throw( IllegalArgumentException_t,
+ IndexOutOfBoundsException_t,
+ WrappedTargetException_t,
RuntimeException_t)
{
T t;
if( isValidIndex( nIndex) )
- if( ( aElement >>= t ) && isValid( t ) )
+ if( ( aElement >>= t ) && isValid( t ) )
setItem( nIndex, t );
else
throw IllegalArgumentException_t();
@@ -216,22 +216,22 @@ public:
return new Enumeration( this );
}
-
+
// XSet : XEnumerationAccess
- virtual sal_Bool SAL_CALL has( const Any_t& aElement )
+ virtual sal_Bool SAL_CALL has( const Any_t& aElement )
throw( RuntimeException_t )
{
T t;
return ( aElement >>= t ) ? hasItem( t ) : sal_False;
}
-
+
virtual void SAL_CALL insert( const Any_t& aElement )
throw( IllegalArgumentException_t,
- ElementExistException_t,
+ ElementExistException_t,
RuntimeException_t )
{
T t;
- if( ( aElement >>= t ) && isValid( t ) )
+ if( ( aElement >>= t ) && isValid( t ) )
if( ! hasItem( t ) )
addItem( t );
else
@@ -257,7 +257,7 @@ public:
// XContainer
- virtual void SAL_CALL addContainerListener(
+ virtual void SAL_CALL addContainerListener(
const XContainerListener_t& xListener )
throw( RuntimeException_t )
{
@@ -272,7 +272,7 @@ public:
throw( RuntimeException_t )
{
OSL_ENSURE( xListener.is(), "need listener!" );
- Listeners_t::iterator aIter =
+ Listeners_t::iterator aIter =
std::find( maListeners.begin(), maListeners.end(), xListener );
if( aIter != maListeners.end() )
maListeners.erase( aIter );
@@ -284,7 +284,7 @@ protected:
void _elementInserted( sal_Int32 nPos )
{
OSL_ENSURE( isValidIndex(nPos), "invalid index" );
- com::sun::star::container::ContainerEvent aEvent(
+ com::sun::star::container::ContainerEvent aEvent(
static_cast<com::sun::star::container::XIndexReplace*>( this ),
com::sun::star::uno::makeAny( nPos ),
com::sun::star::uno::makeAny( getItem( nPos ) ),
@@ -299,7 +299,7 @@ protected:
void _elementRemoved( const T& aOld )
{
- com::sun::star::container::ContainerEvent aEvent(
+ com::sun::star::container::ContainerEvent aEvent(
static_cast<com::sun::star::container::XIndexReplace*>( this ),
com::sun::star::uno::Any(),
com::sun::star::uno::makeAny( aOld ),
@@ -315,7 +315,7 @@ protected:
void _elementReplaced( const sal_Int32 nPos, const T& aNew )
{
OSL_ENSURE( isValidIndex(nPos), "invalid index" );
- com::sun::star::container::ContainerEvent aEvent(
+ com::sun::star::container::ContainerEvent aEvent(
static_cast<com::sun::star::container::XIndexReplace*>( this ),
com::sun::star::uno::makeAny( nPos ),
com::sun::star::uno::makeAny( getItem( nPos ) ),
diff --git a/main/offapi/com/sun/star/awt/tree/XTreeControl.idl
b/main/offapi/com/sun/star/awt/tree/XTreeControl.idl
index 32e181b5ec..2796cc3712 100644
--- a/main/offapi/com/sun/star/awt/tree/XTreeControl.idl
+++ b/main/offapi/com/sun/star/awt/tree/XTreeControl.idl
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -41,7 +41,7 @@
//=============================================================================
-module com { module sun { module star { module awt { module tree {
+module com { module sun { module star { module awt { module tree {
//=============================================================================
@@ -175,14 +175,14 @@ published interface XTreeControl
/** If the given URL points to a loadable graphic, the graphic is rendered
before expanded non leaf nodes.
- <p>This can be overriden for individual nodes by
<member>XTreeNode::getExpandedGraphicURL()</member></p>
+ <p>This can be overridden for individual nodes by
<member>XTreeNode::getExpandedGraphicURL()</member></p>
*/
[attribute] string DefaultExpandedGraphicURL;
/** If the given URL points to a loadable graphic, the graphic is rendered
before collapsed non leaf nodes.
- <p>This can be overriden for individual nodes by
<member>XTreeNode::getCollapsedGraphicURL()</member></p>
+ <p>This can be overridden for individual nodes by
<member>XTreeNode::getCollapsedGraphicURL()</member></p>
*/
[attribute] string DefaultCollapsedGraphicURL;
diff --git
a/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
b/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index f249c58271..eb5841b4c3 100644
--- a/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
@@ -92,7 +92,7 @@
com.sun.star.sheet.SpreadsheetDocument
com.sun.star.presentation.PresentationDocument
com.sun.star.drawing.DrawingDocument
-
+
Recognized shortcuts:
Writer
Calc
@@ -103,9 +103,9 @@
DrawImpress
WriterVariants
These shortcuts exist for even more convenience and handle the
frequent case of Draw
- and Impress as well as different variants of the Writer where they
have otherwise
+ and Impress as well as different variants of the Writer where they
have otherwise
identical context descriptions.
-
+
Special values:
any
none
@@ -119,11 +119,11 @@
Special values:
any
- 3 Panel state. One of
+ 3 Panel state. One of
visible Panel is initially visible and expanded
- hidden Panel is initially collapsed, ie only its title bar is
visible
+ hidden Panel is initially collapsed, i.e. only its title bar is
visible
- 4 (Optional, only used for panels) UNO command that overrides the
DefaultMenuCommand. Use
+ 4 (Optional, only used for panels) UNO command that overrides the
DefaultMenuCommand. Use
the special value none to override the DefaultMenuCommand to the
empty string and thereby
disable the showing of a) the menu button in the panel titlebar
and b) the showing of a dialog.
</desc></info>
@@ -186,7 +186,7 @@
<prop oor:name="DefaultMenuCommand" oor:type="xs:string">
<info><desc>
The default UNO command to execute when the user clicks on the menu
button in the panel title bar.
- Can be overriden in the ContextList to provide context dependent
menu dialogs.
+ Can be overridden in the ContextList to provide context dependent
menu dialogs.
When empty then the menu icon is not shown in the panel title bar.
</desc></info>
<value></value>
diff --git
a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/document/_XDocumentInsertable.java
b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/document/_XDocumentInsertable.java
index f882b7c73f..438142a42d 100644
---
a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/document/_XDocumentInsertable.java
+++
b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/document/_XDocumentInsertable.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -54,7 +54,7 @@ import com.sun.star.uno.UnoRuntime;
* <ul> <p>
* The following predefined files needed to complete the test:
* <ul>
-* <li> <code>XDocumentInsertable.sxw</code> : StarWriter document
+* <li> <code>XDocumentInsertable.sxw</code> : Writer document
* which content started with 'XDocumentInsertable test.' string.
* The file is needed if no other file name specified by relation.
* </li>
@@ -77,15 +77,15 @@ public class _XDocumentInsertable extends MultiMethodTest {
*/
public static abstract class InsertChecker {
/**
- * Must be overriden to check if document was
+ * Must be overridden to check if document was
* successfully inserted.
* @return <code>true</code> if document was inserted.
*/
public abstract boolean isInserted() ;
/**
- * Can be overriden to specify different than default
+ * Can be overridden to specify different than default
* document name. This document must be situated in
- * the test document disrectory, and its name must
+ * the test document directory, and its name must
* be specified relational to this directory. By
* default 'XDocumentInsertable.swx' file name returned.
* @return File name of the document to be inserted.
@@ -165,15 +165,15 @@ public class _XDocumentInsertable extends MultiMethodTest
{
ex.printStackTrace(log);
result = false ;
}
-
+
try {
PropertyValue [] szEmptyArgs = new PropertyValue [0];
String docURL = "file:///c:/ThisIsAnInvaldURL";
log.println("Inserting document from URL '" + docURL + "'");
oObj.insertDocumentFromURL(docURL, szEmptyArgs);
-
+
result=false;
-
+
} catch (IOException ex) {
log.println("expected exception was thrown -> ok");
} catch (com.sun.star.lang.IllegalArgumentException ex) {
@@ -183,12 +183,11 @@ public class _XDocumentInsertable extends MultiMethodTest
{
tRes.tested("insertDocumentFromURL()", result);
}
-
+
/**
* Forces environment recreation.
*/
protected void after() {
disposeEnvironment();
- }
+ }
} // finish class _XDocumentInsertable
-
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java
b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java
index 45f2e43284..d1cf6a244c 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/ifc/sdb/_RowSet.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -102,7 +102,7 @@ public class _RowSet extends MultiPropertyTest {
}
/**
- * Overriden method which tests all the properties
+ * Overridden method which tests all the properties
* with <code>SafeTester</code>.
*
* @see SafeTester
@@ -115,15 +115,15 @@ public class _RowSet extends MultiPropertyTest {
boolean result = false;
try {
XConnection the_connection = null;
-
+
try {
the_connection = (XConnection) AnyConverter.toObject(
new Type(XConnection.class),
oObj.getPropertyValue("ActiveConnection"));
} catch (com.sun.star.lang.IllegalArgumentException iae) {
throw new StatusException("couldn't convert Any",iae);
- }
-
+ }
+
result = (the_connection != null);
} catch (com.sun.star.beans.UnknownPropertyException e) {
log.println("the property is unknown");
@@ -142,4 +142,3 @@ public class _RowSet extends MultiPropertyTest {
}
} // EOF DatasourceAdministrationDialog
-
diff --git
a/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiMethodTest.java
b/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiMethodTest.java
index f6275f4118..92d0e2c170 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiMethodTest.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiMethodTest.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
package lib;
import java.io.PrintWriter;
@@ -60,7 +61,7 @@ import stats.Summarizer;
* MultiMethodTest subclass). See also TestResult and MultiMethodTest.tRes
* documentation.
*
- * 4. the before() and after() methods can be overriden to perform some
+ * 4. the before() and after() methods can be overridden to perform some
* actions, accordingly, before and after calling the test methods.
*
* 5. besides tRes, there are some fields initialized in the MultiMethodTest,
@@ -187,7 +188,7 @@ public class MultiMethodTest
}
System.out.println(" is iface: [" + testedClassName + "] testcode:
[" + entry.entryName + "]");
- // quering the tested interface from the tested object
+ // querying the tested interface from the tested object
XInterface tCase = tEnv.getTestObject();
Object oObj = UnoRuntime.queryInterface(testedClass,
tEnv.getTestObject());
diff --git
a/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiPropertyTest.java
b/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiPropertyTest.java
index 4b74710b32..30753f7a29 100644
--- a/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiPropertyTest.java
+++ b/main/qadevOOo/java/OOoRunner/src/main/java/lib/MultiPropertyTest.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
package lib;
import com.sun.star.beans.Property;
@@ -51,9 +52,9 @@ import com.sun.star.uno.Type;
*
* <p>The testProperty() is called, when the MultiMethodTest's testing method
* is not found in the subclass. So, by defining such methods for properties
- * the standard testing behavioutr can be changed.
+ * the standard testing behavior can be changed.
*
- * <p>The testing behaviour also can be changed by overriding compare(),
+ * <p>The testing behavior also can be changed by overriding compare(),
* getNewVAlue() or toString(Object) methods, or by extending PropertyTester
* class.
*
@@ -122,7 +123,7 @@ public class MultiPropertyTest extends MultiMethodTest
/**
* PropertyTester class defines how to test a property and defined
* to allow subclasses of MultiPropertyTest to change the testing
- * behaviour more flexible, since the behaviour can be customized for
+ * behavior more flexible, since the behavior can be customized for
* each property separately, by providing subclass of PropertyTester
* and passing it to testProperty(String, PropertyTester method).
*/
@@ -175,26 +176,26 @@ public class MultiPropertyTest extends MultiMethodTest
try
{
Object oldValue = oObj.getPropertyValue(propName);
-
+
if( (oldValue==null) || utils.isVoid(oldValue) )
{
// #i111560# method getNewValue() does not work with an
empty oldValue
Property prop = info.getPropertyByName(propName);
if( (prop.Attributes & PropertyAttribute.MAYBEVOID) != 0 )
{
- // todo: implement a new test independent from method
getNewValue()
- log.println("changing initially empty MAYBEVOID
properties is not supported by the test framework so far - skip test of
property: " + propName);
+ // TODO: implement a new test independent from method
getNewValue()
+ log.println("changing initially empty MAYBEVOID
properties is not supported by the test framework so far - skip test of
property: " + propName);
tRes.tested(propName, true);
return;
}
else
{
- log.println( "property '"+propName+"' is not set but
is not MAYBEVOID");
+ log.println( "property '"+propName+"' is not set but
is not MAYBEVOID");
tRes.tested(propName, false);
return;
}
}
-
+
Object newValue;
// trying to create new value
@@ -271,14 +272,14 @@ public class MultiPropertyTest extends MultiMethodTest
* (resValue is compared with oldValue with compare method).
*
* <p>If the property is not READ_ONLY, checks that the new value has
- * been successfully set(resValue is compared with newValue with
+ * been successfully set (resValue is compared with newValue with
* compare method).
*
- * <p>If the exception is not null then(except the case of read-only
+ * <p>If the exception is not null then (except the case of read-only
* property and PropertyVetoException above) it is rethrown to allow
* further catching it if needed.
*
- * <p>Subclasses can override to change this behaviour.
+ * <p>Subclasses can override to change this behavior.
*/
protected void checkResult(String propName, Object oldValue,
Object newValue, Object resValue, Exception exception)
@@ -296,7 +297,7 @@ public class MultiPropertyTest extends MultiMethodTest
short attr = prop.Attributes;
boolean readOnly = (prop.Attributes & PropertyAttribute.READONLY)
!= 0;
boolean maybeVoid = (prop.Attributes &
PropertyAttribute.MAYBEVOID) != 0;
- //check get-set methods
+ // check get-set methods
if (maybeVoid)
{
log.println("Property " + propName + " is void");
@@ -460,7 +461,7 @@ public class MultiPropertyTest extends MultiMethodTest
* The method produces new value of the property from the oldValue.
* It returns the result of ValueChanger.changePValue method.
* Subclasses can override the method to return their own value,
- * when the changePValue beahviour is not enough, for example,
+ * when the changePValue behavior is not enough, for example,
* when oldValue is null.
*/
protected Object getNewValue(String propName, Object oldValue)
@@ -472,8 +473,8 @@ public class MultiPropertyTest extends MultiMethodTest
/**
* The method compares obj1 and obj2. It calls
* MultiPropertyTest.compare, but subclasses can override to change
- * the behaviour, since normally compare calls Object.equals method
- * which is not appropriate in some cases(e.g., structs with equals
+ * the behavior, since normally compare calls Object.equals method
+ * which is not appropriate in some cases (e.g., structs with equals
* not overridden).
*/
protected boolean compare(Object obj1, Object obj2)
@@ -484,7 +485,7 @@ public class MultiPropertyTest extends MultiMethodTest
/**
* The method returns a String representation of the obj. It calls
* MultipropertyTest.toString(Object), but subclasses can override
- * to change the behaviour.
+ * to change the behavior.
*/
protected String toString(Object obj)
{
@@ -520,8 +521,8 @@ public class MultiPropertyTest extends MultiMethodTest
}
/**
- * Overriden method of <code>PropertyTester</code> which
- * retruns new value from two values specified.
+ * Overridden method of <code>PropertyTester</code> which
+ * returns new value from two values specified.
*
* @return The second value if old value is equal to the first
* one, the first value otherwise.
diff --git a/main/sc/source/ui/unoobj/fmtuno.cxx
b/main/sc/source/ui/unoobj/fmtuno.cxx
index dca93f6668..0c3eeac630 100644
--- a/main/sc/source/ui/unoobj/fmtuno.cxx
+++ b/main/sc/source/ui/unoobj/fmtuno.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -39,7 +39,7 @@
#include "document.hxx"
#include "unoguard.hxx"
#include "unonames.hxx"
-#include "styleuno.hxx" // ScStyleNameConversion
+#include "styleuno.hxx" // ScStyleNameConversion
#include "tokenarray.hxx"
#include "tokenuno.hxx"
@@ -48,7 +48,7 @@ using namespace ::formula;
//------------------------------------------------------------------------
-// Map nur fuer PropertySetInfo
+// Map only for PropertySetInfo
const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap()
{
@@ -108,7 +108,7 @@ ScConditionMode lcl_ConditionOperatorToMode(
sheet::ConditionOperator eOper )
case sheet::ConditionOperator_LESS: eMode
= SC_COND_LESS; break;
case sheet::ConditionOperator_GREATER: eMode =
SC_COND_GREATER; break;
case sheet::ConditionOperator_LESS_EQUAL: eMode =
SC_COND_EQLESS; break;
- case sheet::ConditionOperator_GREATER_EQUAL: eMode =
SC_COND_EQGREATER; break;
+ case sheet::ConditionOperator_GREATER_EQUAL: eMode =
SC_COND_EQGREATER; break;
case sheet::ConditionOperator_NOT_EQUAL: eMode =
SC_COND_NOTEQUAL; break;
case sheet::ConditionOperator_BETWEEN: eMode =
SC_COND_BETWEEN; break;
case sheet::ConditionOperator_NOT_BETWEEN: eMode =
SC_COND_NOTBETWEEN; break;
@@ -172,20 +172,20 @@ namespace {
FormulaGrammar::Grammar lclResolveGrammar( FormulaGrammar::Grammar
eExtGrammar, FormulaGrammar::Grammar eIntGrammar )
{
- if( eExtGrammar != FormulaGrammar::GRAM_UNSPECIFIED )
- return eExtGrammar;
- OSL_ENSURE( eIntGrammar != FormulaGrammar::GRAM_UNSPECIFIED,
"lclResolveGrammar - unspecified grammar, using GRAM_PODF_A1" );
- return (eIntGrammar == FormulaGrammar::GRAM_UNSPECIFIED) ?
FormulaGrammar::GRAM_PODF_A1 : eIntGrammar;
+ if( eExtGrammar != FormulaGrammar::GRAM_UNSPECIFIED )
+ return eExtGrammar;
+ OSL_ENSURE( eIntGrammar != FormulaGrammar::GRAM_UNSPECIFIED,
"lclResolveGrammar - unspecified grammar, using GRAM_PODF_A1" );
+ return (eIntGrammar == FormulaGrammar::GRAM_UNSPECIFIED) ?
FormulaGrammar::GRAM_PODF_A1 : eIntGrammar;
}
} // namespace
void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat,
- ScDocument* pDoc, FormulaGrammar::Grammar eGrammar) const
+ ScDocument* pDoc, FormulaGrammar::Grammar eGrammar) const
{
// ScConditionalFormat = Core-Struktur, muss leer sein
- DBG_ASSERT( rFormat.IsEmpty(), "FillFormat: Format nicht leer" );
+ DBG_ASSERT( rFormat.IsEmpty(), "FillFormat: Format not empty" );
sal_uInt16 nCount = (sal_uInt16)aEntries.Count();
for (sal_uInt16 i=0; i<nCount; i++)
{
@@ -226,13 +226,13 @@ ScTableConditionalFormat::~ScTableConditionalFormat()
{
ScTableConditionalEntry* pEntry;
aEntries.First();
- while ( ( pEntry = (ScTableConditionalEntry*)aEntries.Remove() ) != NULL )
+ while ( ( pEntry = (ScTableConditionalEntry*)aEntries.Remove() ) !=
NULL )
pEntry->release();
}
void ScTableConditionalFormat::AddEntry_Impl(const ScCondFormatEntryItem&
aEntry)
{
- ScTableConditionalEntry* pNew = new ScTableConditionalEntry(aEntry);
+ ScTableConditionalEntry* pNew = new ScTableConditionalEntry(aEntry);
pNew->acquire();
aEntries.Insert( pNew, LIST_APPEND );
}
@@ -249,8 +249,8 @@ void SAL_CALL ScTableConditionalFormat::addNew(
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- ScCondFormatEntryItem aEntry;
- aEntry.meMode = SC_COND_NONE;
+ ScCondFormatEntryItem aEntry;
+ aEntry.meMode = SC_COND_NONE;
const beans::PropertyValue* pPropArray =
aConditionalEntry.getConstArray();
long nPropCount = aConditionalEntry.getLength();
@@ -338,7 +338,7 @@ void SAL_CALL ScTableConditionalFormat::addNew(
}
}
- AddEntry_Impl(aEntry);
+ AddEntry_Impl(aEntry);
}
void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex )
@@ -358,7 +358,7 @@ void SAL_CALL ScTableConditionalFormat::clear()
throw(uno::RuntimeException)
ScUnoGuard aGuard;
ScTableConditionalEntry* pEntry;
aEntries.First();
- while ( ( pEntry = (ScTableConditionalEntry*)aEntries.Remove() ) != NULL )
+ while ( ( pEntry = (ScTableConditionalEntry*)aEntries.Remove() ) !=
NULL )
pEntry->release();
}
@@ -368,7 +368,7 @@ uno::Reference<container::XEnumeration> SAL_CALL
ScTableConditionalFormat::creat
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return new ScIndexEnumeration(this,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableConditionalEntryEnumeration")));
+ return new ScIndexEnumeration(this,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.TableConditionalEntryEnumeration")));
}
// XIndexAccess
@@ -386,10 +386,10 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex(
sal_Int32 nIndex )
ScUnoGuard aGuard;
uno::Reference<sheet::XSheetConditionalEntry>
xEntry(GetObjectByIndex_Impl((sal_uInt16)nIndex));
if (xEntry.is())
- return uno::makeAny(xEntry);
+ return uno::makeAny(xEntry);
else
throw lang::IndexOutOfBoundsException();
-// return uno::Any();
+// return uno::Any();
}
uno::Type SAL_CALL ScTableConditionalFormat::getElementType()
throw(uno::RuntimeException)
@@ -430,10 +430,10 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName(
const rtl::OUString& aNam
}
if (xEntry.is())
- return uno::makeAny(xEntry);
+ return uno::makeAny(xEntry);
else
throw container::NoSuchElementException();
-// return uno::Any();
+// return uno::Any();
}
uno::Sequence<rtl::OUString> SAL_CALL
ScTableConditionalFormat::getElementNames()
@@ -472,7 +472,7 @@ sal_Int64 SAL_CALL ScTableConditionalFormat::getSomething(
0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
- return
sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
+ return
sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
}
return 0;
}
@@ -501,7 +501,7 @@ ScTableConditionalFormat*
ScTableConditionalFormat::getImplementation(
ScTableConditionalFormat* pRet = NULL;
uno::Reference<lang::XUnoTunnel> xUT( xObj, uno::UNO_QUERY );
if (xUT.is())
- pRet =
reinterpret_cast<ScTableConditionalFormat*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId())));
+ pRet =
reinterpret_cast<ScTableConditionalFormat*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething(getUnoTunnelId())));
return pRet;
}
@@ -513,9 +513,9 @@ ScTableConditionalFormat*
ScTableConditionalFormat::getImplementation(
//UNUSED2008-05 }
ScTableConditionalEntry::ScTableConditionalEntry(const ScCondFormatEntryItem&
aItem) :
- aData( aItem )
+ aData( aItem )
{
- // #i113668# only store the settings, keep no reference to parent object
+ // #i113668# only store the settings, keep no reference to parent object
}
ScTableConditionalEntry::~ScTableConditionalEntry()
@@ -524,7 +524,7 @@ ScTableConditionalEntry::~ScTableConditionalEntry()
void ScTableConditionalEntry::GetData(ScCondFormatEntryItem& rData) const
{
- rData = aData;
+ rData = aData;
}
// XSheetCondition
@@ -533,14 +533,14 @@ sheet::ConditionOperator SAL_CALL
ScTableConditionalEntry::getOperator()
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- return lcl_ConditionModeToOperator( aData.meMode );
+ return lcl_ConditionModeToOperator( aData.meMode );
}
void SAL_CALL ScTableConditionalEntry::setOperator( sheet::ConditionOperator
nOperator )
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- aData.meMode = lcl_ConditionOperatorToMode( nOperator );
+ aData.meMode = lcl_ConditionOperatorToMode( nOperator );
}
rtl::OUString SAL_CALL ScTableConditionalEntry::getFormula1()
throw(uno::RuntimeException)
@@ -616,7 +616,7 @@ ScTableValidationObj::ScTableValidationObj(ScDocument*
pDoc, sal_uLong nKey,
if (pData)
{
nMode = sal::static_int_cast<sal_uInt16>( pData->GetOperation() );
- aSrcPos = pData->GetValidSrcPos(); // #b4974740# valid pos for
expressions
+ aSrcPos = pData->GetValidSrcPos(); // #b4974740# valid pos for
expressions
aExpr1 = pData->GetExpression( aSrcPos, 0, 0, eGrammar
);
aExpr2 = pData->GetExpression( aSrcPos, 1, 0, eGrammar
);
meGrammar1 = meGrammar2 = eGrammar;
@@ -700,7 +700,7 @@ void ScTableValidationObj::ClearData_Impl()
aExpr2.Erase();
maExprNmsp1.Erase();
maExprNmsp2.Erase();
- meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be
overriden when needed
+ meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be
overridden when needed
aInputTitle.Erase();
aInputMessage.Erase();
aErrorTitle.Erase();
@@ -724,7 +724,7 @@ void SAL_CALL ScTableValidationObj::setOperator(
sheet::ConditionOperator nOpera
throw(uno::RuntimeException)
{
ScUnoGuard aGuard;
- nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode(
nOperator ) );
+ nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode(
nOperator ) );
}
rtl::OUString SAL_CALL ScTableValidationObj::getFormula1()
throw(uno::RuntimeException)
@@ -825,7 +825,7 @@ void SAL_CALL ScTableValidationObj::setPropertyValue(
if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) ) bShowInput =
ScUnoHelpFunctions::GetBoolFromAny( aValue );
else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) ) bShowError =
ScUnoHelpFunctions::GetBoolFromAny( aValue );
else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) ) bIgnoreBlank =
ScUnoHelpFunctions::GetBoolFromAny( aValue );
- else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aValue >>=
nShowList;
+ else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aValue >>=
nShowList;
else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) )
{
rtl::OUString aStrVal;
@@ -939,7 +939,7 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue(
const rtl::OUString& a
if ( aString.EqualsAscii( SC_UNONAME_SHOWINP ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, bShowInput );
else if ( aString.EqualsAscii( SC_UNONAME_SHOWERR ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, bShowError );
else if ( aString.EqualsAscii( SC_UNONAME_IGNOREBL ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, bIgnoreBlank );
- else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aRet <<= nShowList;
+ else if ( aString.EqualsAscii( SC_UNONAME_SHOWLIST ) ) aRet <<=
nShowList;
else if ( aString.EqualsAscii( SC_UNONAME_INPTITLE ) ) aRet <<=
rtl::OUString( aInputTitle );
else if ( aString.EqualsAscii( SC_UNONAME_INPMESS ) ) aRet <<=
rtl::OUString( aInputMessage );
else if ( aString.EqualsAscii( SC_UNONAME_ERRTITLE ) ) aRet <<=
rtl::OUString( aErrorTitle );
@@ -1020,8 +1020,4 @@ ScTableValidationObj*
ScTableValidationObj::getImplementation(
return pRet;
}
-//------------------------------------------------------------------------
-
-
-
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/slideshow/source/engine/animationnodes/animationaudionode.hxx
b/main/slideshow/source/engine/animationnodes/animationaudionode.hxx
index d1873b6c45..b57f4d5531 100644
--- a/main/slideshow/source/engine/animationnodes/animationaudionode.hxx
+++ b/main/slideshow/source/engine/animationnodes/animationaudionode.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
#ifndef INCLUDED_SLIDESHOW_ANIMATIONAUDIONODE_HXX
#define INCLUDED_SLIDESHOW_ANIMATIONAUDIONODE_HXX
@@ -32,9 +33,9 @@ namespace slideshow {
namespace internal {
/** Audio node.
-
+
This animation node contains an audio effect. Duration and
- start/stop behaviour is affected by the referenced audio
+ start/stop behavior is affected by the referenced audio
file.
*/
class AnimationAudioNode : public BaseNode, public AnimationEventHandler
@@ -42,27 +43,27 @@ class AnimationAudioNode : public BaseNode, public
AnimationEventHandler
public:
AnimationAudioNode(
::com::sun::star::uno::Reference<
- ::com::sun::star::animations::XAnimationNode> const& xNode,
+ ::com::sun::star::animations::XAnimationNode> const& xNode,
::boost::shared_ptr<BaseContainerNode> const& pParent,
NodeContext const& rContext );
-
+
protected:
virtual void dispose();
-
+
private:
virtual void activate_st();
virtual void deactivate_st( NodeState eDestState );
virtual bool hasPendingAnimation() const;
-
- /// overriden, because we need to deal with STOPAUDIO commands
+
+ /// overridden, because we need to deal with STOPAUDIO commands
virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode );
-
+
private:
- ::com::sun::star::uno::Reference<
+ ::com::sun::star::uno::Reference<
::com::sun::star::animations::XAudio > mxAudioNode;
::rtl::OUString maSoundURL;
mutable SoundPlayerSharedPtr mpPlayer;
-
+
void createPlayer() const;
void resetPlayer() const;
};
diff --git a/main/sw/source/filter/ww8/ww8par3.cxx
b/main/sw/source/filter/ww8/ww8par3.cxx
index 2cb4aae0ad..dbf8968261 100644
--- a/main/sw/source/filter/ww8/ww8par3.cxx
+++ b/main/sw/source/filter/ww8/ww8par3.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -86,7 +86,7 @@
#include "writerhelper.hxx"
#include "writerwordglue.hxx"
#include "ww8par.hxx"
-#include "ww8par2.hxx" // wg. Listen-Attributen in Styles
+#include "ww8par2.hxx" // wg. Listen-Attributen in Styles
#include <IMark.hxx>
#include <unotools/fltrcfg.hxx>
@@ -104,7 +104,7 @@ using namespace sw::mark;
// UNO-Controls
//-----------------------------------------
-//cmc, OCX i.e. word 97 form controls
+//cmc, OCX i.e. Word 97 form controls
eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, String& )
{
if( bObj && nPicLocFc )
@@ -124,9 +124,9 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc*
pF, String& rStr )
/* #80205#
Here we have a small complication. This formula control contains
the default text that is displayed if you edit the form field in
- the "default text" area. But MSOffice does not display that
+ the "default text" area. But MS Office does not display that
information, instead it display the result of the field,
- MSOffice just uses the default text of the control as its
+ MS Office just uses the default text of the control as its
initial value for the displayed default text. So we will swap in
the field result into the formula here in place of the default
text.
@@ -170,7 +170,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc*
pF, String& rStr )
String aBookmarkFind=pB->GetBookmark(currentCP-1,
currentCP+currentLen-1, bkmFindIdx);
if (aBookmarkFind.Len()>0) {
- pB->SetStatus(bkmFindIdx, BOOK_FIELD); // mark bookmark as
consumed, such that tl'll not get inserted as a "normal" bookmark again
+ pB->SetStatus(bkmFindIdx, BOOK_FIELD); // mark bookmark as
consumed, such that it will not get inserted as a "normal" bookmark again
if (aBookmarkFind.Len()>0) {
aBookmarkName=aBookmarkFind;
}
@@ -274,7 +274,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc*
pF, String& rStr)
if (!aFormula.maListEntries.empty())
{
aFld.SetItems(aFormula.maListEntries);
- int nIndex = aFormula.fDropdownIndex <
aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
+ int nIndex = aFormula.fDropdownIndex <
aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
aFld.SetSelectedItem(aFormula.maListEntries[nIndex]);
}
@@ -317,7 +317,7 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc*
pF, String& rStr)
uno::Sequence< ::rtl::OUString >
vListEntries(aFormula.maListEntries.size());
::std::copy(aFormula.maListEntries.begin(),
aFormula.maListEntries.end(), ::comphelper::stl_begin(vListEntries));
(*pFieldmark->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY)]
= uno::makeAny(vListEntries);
- sal_Int32 nIndex = aFormula.fDropdownIndex <
aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
+ sal_Int32 nIndex = aFormula.fDropdownIndex <
aFormula.maListEntries.size() ? aFormula.fDropdownIndex : 0;
(*pFieldmark->GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_RESULT)]
= uno::makeAny(nIndex);
// set field data here...
}
@@ -396,11 +396,11 @@ struct WW8LFOLVL
long nStartAt; // start-at value if bFormat==false and bStartAt
== true
// (if bFormat==true, the start-at
is stored in the LVL)
sal_uInt8 nLevel; // the level to be overridden
- // dieses Byte ist _absichtlich_ nicht in das folgende Byte hineingepackt
!!
+ // dieses Byte ist _absichtlich_ nicht in das folgende Byte hineingepackt!
// (siehe Kommentar unten bei struct WW8LFOInfo)
sal_uInt8 bStartAt :1; // true if the start-at value is overridden
- sal_uInt8 bFormat :1; // true if the formatting is overriden
+ sal_uInt8 bFormat :1; // true if the formatting is overridden
WW8LFOLVL() :
nStartAt(1), nLevel(0), bStartAt(1), bFormat(0) {}
@@ -425,7 +425,7 @@ struct WW8LSTInfo // sortiert nach nIdLst (in WW8
verwendete Listen-Id)
: pNumRule(pNumRule_), nIdLst(aLST.nIdLst),
bSimpleList(aLST.bSimpleList), bUsedInDoc(0)
{
- memcpy( aIdSty, aLST.aIdSty, sizeof( aIdSty ));
+ memcpy( aIdSty, aLST.aIdSty, sizeof( aIdSty ));
memset(&aItemSet, 0, sizeof( aItemSet ));
memset(&aCharFmt, 0, sizeof( aCharFmt ));
}
@@ -545,7 +545,7 @@ bool WW8ListManager::ReadLVL(
SvxAdjust eAdj; // Ausrichtung (Links/rechts/zent.)
sal_Unicode cBullet(0x2190); // default safe bullet
- sal_Unicode cGrfBulletCP(USHRT_MAX);
+ sal_Unicode cGrfBulletCP(USHRT_MAX);
String sPrefix;
String sPostfix;
@@ -623,7 +623,7 @@ bool WW8ListManager::ReadLVL(
sal_uInt8 *pBegin = pSprm-2;
for(int i=0;i<4;++i)
rParaSprms.push_back(*pBegin++);
- aLVL.nDxaLeft1 = SVBT16ToShort( pSprm );
+ aLVL.nDxaLeft1 = SVBT16ToShort( pSprm );
}
// --> OD 2008-06-04 #i86652# - read tab setting
@@ -692,17 +692,17 @@ bool WW8ListManager::ReadLVL(
//
sal_uInt16 nWitchPicIsBullet = USHRT_MAX;
bool bIsPicBullet = false;
-
+
if( aLVL.nLenGrpprlChpx )
{
sal_uInt8 aGrpprlChpx[ 255 ];
memset(&aGrpprlChpx, 0, sizeof( aGrpprlChpx ));
if(aLVL.nLenGrpprlChpx != rSt.Read(&aGrpprlChpx, aLVL.nLenGrpprlChpx))
return false;
-
+
//For i120928,parse the graphic info of bullets
sal_uInt8 *pSprmWhichPis =
GrpprlHasSprm(0x6887,aGrpprlChpx[0],aLVL.nLenGrpprlChpx);
- sal_uInt8 *pSprmIsPicBullet =
GrpprlHasSprm(0x4888,aGrpprlChpx[0],aLVL.nLenGrpprlChpx);
+ sal_uInt8 *pSprmIsPicBullet =
GrpprlHasSprm(0x4888,aGrpprlChpx[0],aLVL.nLenGrpprlChpx);
if (pSprmWhichPis)
{
nWitchPicIsBullet = *pSprmWhichPis;
@@ -711,7 +711,7 @@ bool WW8ListManager::ReadLVL(
{
bIsPicBullet = (*pSprmIsPicBullet) & 0x0001;
}
-
+
// neues ItemSet fuer die Zeichenattribute anlegen
rpItemSet = new SfxItemSet( rDoc.GetAttrPool(), RES_CHRATR_BEGIN,
RES_CHRATR_END - 1 );
@@ -795,11 +795,11 @@ bool WW8ListManager::ReadLVL(
case 35:
case 36:
case 37:
- case 39:
+ case 39:
nType = style::NumberingType::NUMBER_LOWER_ZH ; break;
case 34: nType = style::NumberingType::NUMBER_UPPER_ZH_TW ;
break;
case 38: nType = style::NumberingType::NUMBER_UPPER_ZH ; break;
- case 10:
+ case 10:
case 11:
nType = style::NumberingType::NUMBER_TRADITIONAL_JA ;
break;
case 20: nType = style::NumberingType::AIU_FULLWIDTH_JA ;
break;
@@ -810,14 +810,14 @@ bool WW8ListManager::ReadLVL(
case 25: nType = style::NumberingType::HANGUL_JAMO_KO;
break;
case 41: nType = style::NumberingType::NUMBER_HANGUL_KO; break;
case 44: nType = style::NumberingType::NUMBER_UPPER_KO; break;
-
+
default:
// take default
nType = style::NumberingType::ARABIC;
break;
}
- //If a number level is not going to be used, then record this fact
+ // If a number level is not going to be used, then record this fact
if (style::NumberingType::NUMBER_NONE == nType)
rNotReallyThere[nLevel] = true;
@@ -880,9 +880,9 @@ bool WW8ListManager::ReadLVL(
if (!cBullet) // unsave control code?
cBullet = 0x2190;
- } else if (style::NumberingType::BITMAP == nType) //For i120928,position
index info of graphic
+ } else if (style::NumberingType::BITMAP == nType) //For i120928, position
index info of graphic
{
- cGrfBulletCP = nWitchPicIsBullet; // This is a bullet
picture ID
+ cGrfBulletCP = nWitchPicIsBullet; // This is a bullet
picture ID
} else
{
/*
@@ -933,7 +933,7 @@ bool WW8ListManager::ReadLVL(
eAdj = SVX_ADJUST_LEFT;
break;
default:
- // undefied value
+ // undefined value
ASSERT( sal_False, "Value of aLVL.nAlign is not supported" );
// take default
eAdj = SVX_ADJUST_LEFT;
@@ -954,7 +954,7 @@ bool WW8ListManager::ReadLVL(
// SetBulletFont() rufen !!!
}
//For i120928,position index info
- else if (style::NumberingType::BITMAP == nType)
+ else if (style::NumberingType::BITMAP == nType)
{
rNumFmt.SetGrfBulletCP(cGrfBulletCP);
}
@@ -1089,7 +1089,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel,
SwNumRule& rNumRule,
// Style an das NumFormat haengen
//
aNumFmt.SetCharFmt( pFmt );
- }
+ }
//Modify for #119405 by chengjh, 2012-08-16
//Ensure the default char fmt is initialized for any level of num ruler
if no customized attr
else
@@ -1099,7 +1099,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel,
SwNumRule& rNumRule,
{
String aName( sPrefix.Len() ? sPrefix :
rNumRule.GetName() );
(aName += 'z') += String::CreateFromInt32( nLevel );
-
+
pFmt = rDoc.MakeCharFmt(aName,
(SwCharFmt*)rDoc.GetDfltCharFmt());
bNewCharFmtCreated = true;
rCharFmt[ nLevel ] = pFmt;
@@ -1234,7 +1234,7 @@ WW8ListManager::WW8ListManager(
/*
#i1869#
- In word 2000 microsoft got rid of creating new "simple lists" with
+ In Word 2000 Microsoft got rid of creating new "simple lists" with
only 1 level, all new lists are created with 9 levels. To hack it
so that the list types formerly known as simple lists still have
their own tab page to themselves one of the reserved bits is used
@@ -1358,8 +1358,8 @@ WW8ListManager::WW8ListManager(
WW8LFOInfo* pLFOInfo = new WW8LFOInfo(aLFO);
if ( pParentListInfo != NULL )
{
- //Copy the basic paragraph properties for each level from the
- //original list into the list format override levels.
+ // Copy the basic paragraph properties for each level from the
+ // original list into the list format override levels.
int nMaxSize = pParentListInfo->maParaSprms.size();
pLFOInfo->maParaSprms.resize(nMaxSize);
for (int i = 0; i < nMaxSize; ++i)
@@ -1437,7 +1437,7 @@ WW8ListManager::WW8ListManager(
//2.2.2.0 skip inter-group of override header ?
//See #i25438# for why I moved this here, compare
//that original bugdoc's binary to what it looks like
- //when resaved with word, i.e. there is always a
+ //when resaved with Word, i.e. there is always a
//4 byte header, there might be more than one if
//that header was 0xFFFFFFFF, e.g. #114412# ?
sal_uInt32 nTest;
@@ -1616,7 +1616,7 @@ bool IsEqualFormatting(const SwNumRule &rOne, const
SwNumRule &rTwo)
{
for (sal_uInt8 n = 0; n < MAXLEVEL; ++n )
{
- //The SvxNumberFormat compare, not the SwNumFmt compare
+ // The SvxNumberFormat compare, not the SwNumFmt compare
const SvxNumberFormat &rO = rOne.Get(n);
const SvxNumberFormat &rT = rTwo.Get(n);
if (!(rO == rT))
@@ -1662,14 +1662,14 @@ SwNumRule*
WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
nLastLFOPosition = nLFOPosition;
/*
#i1869#
- If this list has had its bits set in word 2000 to pretend that it is a
+ If this list has had its bits set in Word 2000 to pretend that it is a
simple list from the point of view of the user, then it is almost
certainly a simple continuous list, and we will try to keep it like that.
Otherwise when we save again it will be shown as the true outline list
that it is, confusing the user that just wanted what they thought was a
- simple list. On the otherhand it is possible that some of the other levels
+ simple list. On the other hand it is possible that some of the other levels
were used by the user, in which case we will not pretend anymore that it
- is a simple list. Something that word 2000 does anyway, that 97 didn't, to
+ is a simple list. Something that Word 2000 does anyway, that 97 didn't, to
my bewilderment.
*/
if (nLevel && pLFOInfo->pNumRule->IsContinusNum())
@@ -1707,7 +1707,7 @@ SwNumRule*
WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
bool bNoChangeFromParent =
IsEqualFormatting(*pRet, *(pParentListInfo->pNumRule));
- //If so then I think word still uses the parent (maybe)
+ // If so then I think Word still uses the parent (maybe)
if (bNoChangeFromParent)
{
pRet = pParentListInfo->pNumRule;
@@ -1744,7 +1744,7 @@ SwNumRule*
WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
{
pNode->SetAttrListLevel(nLevel);
- if (bRestart || bNewstart) //#112466# (I think)
+ if (bRestart || bNewstart) // #112466# (I think)
pNode->SetListRestart(true);
if (bNewstart)
pNode->SetAttrListRestartValue(nStart);
@@ -1841,7 +1841,7 @@ void SwWW8ImplReader::SetStylesList(
(WW8ListManager::nMaxLevel > nActLevel)
)
{
- rStyleInf.nLFOIndex = nActLFO;
+ rStyleInf.nLFOIndex = nActLFO;
rStyleInf.nListLevel = nActLevel;
if (
@@ -1866,14 +1866,14 @@ void SwWW8ImplReader::RegisterNumFmtOnStyle( sal_uInt16
nStyle )
SwWW8StyInf &rStyleInf = pCollA[nStyle];
if (rStyleInf.bValid && rStyleInf.pFmt)
{
- //Save old pre-list modified indent, which are the word indent values
+ // Save old pre-list modified indent, which are the word indent values
rStyleInf.maWordLR =
ItemGet<SvxLRSpaceItem>(*rStyleInf.pFmt, RES_LR_SPACE);
// Phase 2: aktualisieren der StyleDef nach einlesen aller Listen
SwNumRule* pNmRule = 0;
const sal_uInt16 nLFO = rStyleInf.nLFOIndex;
- const sal_uInt8 nLevel = rStyleInf.nListLevel;
+ const sal_uInt8 nLevel = rStyleInf.nListLevel;
if (
(USHRT_MAX > nLFO) &&
(WW8ListManager::nMaxLevel > nLevel)
@@ -1966,14 +1966,14 @@ void SwWW8ImplReader::RegisterNumFmtOnTxtNode(
/*
Take the original paragraph sprms attached to this list level
formatting and apply them to the paragraph. I'm convinced that
- this is exactly what word does.
+ this is exactly what Word does.
*/
if (short nLen = static_cast< short >(aParaSprms.size()))
{
SfxItemSet* pOldAktItemSet = pAktItemSet;
SetAktItemSet(&aListIndent);
- sal_uInt8* pSprms1 = &aParaSprms[0];
+ sal_uInt8* pSprms1 = &aParaSprms[0];
while (0 < nLen)
{
sal_uInt16 nL1 = ImportSprm(pSprms1);
@@ -2031,9 +2031,9 @@ void SwWW8ImplReader::Read_ListLevel(sal_uInt16, const
sal_uInt8* pData,
/*
#94672#
if this is the case, then if the numbering is actually stored in
- winword 6 format, and its likely that sprmPIlvl has been abused
+ WinWord 6 format, and its likely that sprmPIlvl has been abused
to set the ww6 list level information which we will need when we
- reach the true ww6 list def. So set it now
+ reach the true ww6 list def. So set it now
*/
pStyles->nWwNumLevel = nListLevel;
}
@@ -2089,7 +2089,7 @@ void SwWW8ImplReader::Read_LFOPosition(
{
/*
#94672# discussion
- If you have a paragraph in word with left and/or hanging indent
+ If you have a paragraph in Word with left and/or hanging indent
and remove its numbering, then the indentation appears to get
reset, but not back to the base style, instead its goes to a blank
setting.
@@ -2101,7 +2101,7 @@ void SwWW8ImplReader::Read_LFOPosition(
if (pAktColl)
{
pAktColl->SetFmtAttr(*GetDfltAttr( RES_PARATR_NUMRULE));
- pAktColl->SetFmtAttr(SvxLRSpaceItem(RES_LR_SPACE));
//#94672#
+ pAktColl->SetFmtAttr(SvxLRSpaceItem(RES_LR_SPACE)); // #94672#
}
else if (SwTxtNode* pTxtNode = pPaM->GetNode()->GetTxtNode())
{
@@ -2144,9 +2144,9 @@ void SwWW8ImplReader::Read_LFOPosition(
/*
#94672#
If we are a ww8+ style with ww7- style lists then there is a
- bizarre broken word bug where when the list is removed from a para
+ bizarre broken Word bug where when the list is removed from a para
the ww6 list first line indent still affects the first line
- indentation. Setting this flag will allow us to recover from this
+ indentation. Setting this flag will allow us to recover from this
braindeadness
*/
if ( pAktColl
@@ -2158,7 +2158,7 @@ void SwWW8ImplReader::Read_LFOPosition(
// die Streamdaten sind hier 1 basiert, wir ziehen EINS ab
if (USHRT_MAX > nLFOPosition)
{
- if (nLFOPosition != 2047-1) //Normal ww8+ list behaviour
+ if (nLFOPosition != 2047-1) // Normal ww8+ list behavior
{
if ( nListLevel == WW8ListManager::nMaxLevel )
{
@@ -2202,7 +2202,7 @@ bool
SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
* Doing so will set the nPicLocFc to the offset to find the hypertext
* data in the data stream.
*/
- WW8_CP nEndCp = nStart+1; //Only interested in the single 0x01 character
+ WW8_CP nEndCp = nStart+1; // Only interested in the single 0x01 character
WW8ReaderSave aSave(this,nStart);
@@ -2277,7 +2277,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
int nType=0;
*pDataStream >> nHeaderByte;
- if (nHeaderByte == 0xFF) //Guesswork time, difference between 97 and 95 ?
+ if (nHeaderByte == 0xFF) // Guesswork time, difference between 97 and 95 ?
{
pDataStream->SeekRel(3);
*pDataStream >> nHeaderByte;
@@ -2296,7 +2296,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
*pDataStream >> hpsCheckBox;
if (nType == 0)
- pDataStream->SeekRel(2); //Guess
+ pDataStream->SeekRel(2); // Guess
rtl_TextEncoding eEnc = rRdr.eStructCharSet;
sTitle = !nType ? WW8ReadPString(*pDataStream, eEnc, true)
@@ -2310,11 +2310,11 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
sal_uInt8 iRes = (nHeaderByte >> 2) & 0x1F;
switch (iRes)
{
- case 1: //checked
+ case 1: // checked
nChecked = true;
break;
case 25: //undefined, Undefined checkboxes are treated as unchecked
- case 0: //unchecked
+ case 0: // unchecked
nChecked = false;
break;
default:
@@ -2336,7 +2336,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
sHelp = !nType ? WW8ReadPString(*pDataStream, eEnc, true)
: WW8Read_xstz(*pDataStream, 0, true);
- if (nWhich == WW8_CT_DROPDOWN) //is this the case ?
+ if (nWhich == WW8_CT_DROPDOWN) // is this the case ?
fToolTip = true;
if( fToolTip )
@@ -2368,7 +2368,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
*pDataStream >> nDummy2;
if (nDummy2 != 0xA)
bAllOk = false;
- if (!bAllOk) //Not as expected, don't risk it at all.
+ if (!bAllOk) // Not as expected, don't risk it at all.
nNoStrings = 0;
for (sal_uInt16 nI = 0; nI < nNoStrings; ++nI)
pDataStream->SeekRel(2);
@@ -2381,7 +2381,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType
nWhich,
}
ASSERT(bAllOk,
"Unknown formfield dropdown list structure. Report to cmc");
- if (!bAllOk) //Not as expected, don't risk it at all.
+ if (!bAllOk) // Not as expected, don't risk it at all.
nNoStrings = 0;
maListEntries.reserve(nNoStrings);
for (sal_uInt32 nI = 0; nI < nNoStrings; ++nI)
@@ -2717,8 +2717,8 @@ sal_Bool SwMSConvertControls::InsertControl(
aTmp <<= nTemp;
xShapePropSet->setPropertyValue(C2U("VertOrient"), aTmp );
- uno::Reference< text::XText > xDummyTxtRef;
- uno::Reference< text::XTextRange > xTxtRg =
+ uno::Reference< text::XText > xDummyTxtRef;
+ uno::Reference< text::XTextRange > xTxtRg =
new SwXTextRange( *pPaM, xDummyTxtRef );
aTmp.setValue(&xTxtRg,::getCppuType((
@@ -2726,9 +2726,9 @@ sal_Bool SwMSConvertControls::InsertControl(
xShapePropSet->setPropertyValue(C2U("TextRange"), aTmp );
// Das Control-Model am Control-Shape setzen
- uno::Reference< drawing::XControlShape > xControlShape( xShape,
+ uno::Reference< drawing::XControlShape > xControlShape( xShape,
uno::UNO_QUERY );
- uno::Reference< awt::XControlModel > xControlModel( rFComp,
+ uno::Reference< awt::XControlModel > xControlModel( rFComp,
uno::UNO_QUERY );
xControlShape->setControl( xControlModel );
@@ -2738,7 +2738,4 @@ sal_Bool SwMSConvertControls::InsertControl(
return sal_True;
}
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
-
-
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/win/source/gdi/salgdi_gdiplus.cxx
b/main/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 0c86025e79..f702315784 100644
--- a/main/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/main/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,18 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
@@ -77,7 +79,7 @@ void
impAddB2DPolygonToGDIPlusGraphicsPathReal(Gdiplus::GraphicsPath& rPath, con
const basegfx::B2DPoint
aCb(rPolygon.getPrevControlPoint(nNextIndex));
rPath.AddBezier(
- aFCurr,
+ aFCurr,
Gdiplus::PointF(Gdiplus::REAL(aCa.getX()),
Gdiplus::REAL(aCa.getY())),
Gdiplus::PointF(Gdiplus::REAL(aCb.getX()),
Gdiplus::REAL(aCb.getY())),
aFNext);
@@ -123,7 +125,7 @@ void
impAddB2DPolygonToGDIPlusGraphicsPathInteger(Gdiplus::GraphicsPath& rPath,
const basegfx::B2DPoint
aCb(rPolygon.getPrevControlPoint(nNextIndex));
rPath.AddBezier(
- aICurr,
+ aICurr,
Gdiplus::Point(INT(aCa.getX()),
INT(aCa.getY())),
Gdiplus::Point(INT(aCb.getX()),
INT(aCb.getY())),
aINext);
@@ -184,9 +186,9 @@ bool WinSalGraphics::drawPolyPolygon( const
::basegfx::B2DPolyPolygon& rPolyPoly
// Normally GdiPlus should not be used for printing at all since
printers cannot
// print transparent filled polygon geometry and normally this
does not happen
// since OutputDevice::RemoveTransparenciesFromMetaFile is used as
preparation
- // and no transparent parts should remain for printing. But this
can be overriden
- // by the user and thus happens. This call can only come
(currently) from
- // OutputDevice::DrawTransparent, see comments sthere with the
same TaskID.
+ // and no transparent parts should remain for printing. But this
can be overridden
+ // by the user and thus happens. This call can only come
(currently) from
+ // OutputDevice::DrawTransparent, see comments there with the same
TaskID.
// If it is used, the mapping for the printer is wrong and needs
to be corrected. I
// checked that there is *no* transformation set (testcode
commented out below) and
// estimated that a stable factor dependent of the printer's DPI
is used. Create
@@ -211,14 +213,14 @@ bool WinSalGraphics::drawPolyPolygon( const
::basegfx::B2DPolyPolygon& rPolyPoly
return true;
}
-bool WinSalGraphics::drawPolyLine(
- const basegfx::B2DPolygon& rPolygon,
- double fTransparency,
- const basegfx::B2DVector& rLineWidths,
- basegfx::B2DLineJoin eLineJoin,
- com::sun::star::drawing::LineCap eLineCap)
+bool WinSalGraphics::drawPolyLine(
+ const basegfx::B2DPolygon& rPolygon,
+ double fTransparency,
+ const basegfx::B2DVector& rLineWidths,
+ basegfx::B2DLineJoin eLineJoin,
+ com::sun::star::drawing::LineCap eLineCap)
{
- const sal_uInt32 nCount(rPolygon.count());
+ const sal_uInt32 nCount(rPolygon.count());
if(mbPen && nCount)
{
@@ -294,7 +296,7 @@ bool WinSalGraphics::drawPolyLine(
// #i101491# needed to create the correct line joins
aPath.CloseFigure();
}
-
+
if(getAntiAliasB2DDraw())
{
aGraphics.SetSmoothingMode(Gdiplus::SmoothingModeAntiAlias);
@@ -321,7 +323,7 @@ void paintToGdiPlus(
Gdiplus::PointF aDestPoints[3];
Gdiplus::ImageAttributes aAttributes;
- // define target region as paralellogram
+ // define target region as parallelogram
aDestPoints[0].X = Gdiplus::REAL(rTR.mnDestX);
aDestPoints[0].Y = Gdiplus::REAL(rTR.mnDestY);
aDestPoints[1].X = Gdiplus::REAL(rTR.mnDestX + rTR.mnDestWidth);
@@ -332,7 +334,7 @@ void paintToGdiPlus(
aAttributes.SetWrapMode(Gdiplus::WrapModeTileFlipXY);
rGraphics.DrawImage(
- &rBitmap,
+ &rBitmap,
aDestPoints,
3,
Gdiplus::REAL(rTR.mnSrcX),
@@ -388,15 +390,15 @@ bool WinSalGraphics::tryDrawBitmapGdiPlus(const
SalTwoRect& rTR, const SalBitmap
Gdiplus::Graphics aGraphics(getHDC());
setInterpolationMode(
- aGraphics,
+ aGraphics,
rTR.mnSrcWidth,
- rTR.mnDestWidth,
+ rTR.mnDestWidth,
rTR.mnSrcHeight,
rTR.mnDestHeight);
paintToGdiPlus(
- aGraphics,
- rTR,
+ aGraphics,
+ rTR,
*aARGB.get());
return true;
@@ -406,9 +408,9 @@ bool WinSalGraphics::tryDrawBitmapGdiPlus(const SalTwoRect&
rTR, const SalBitmap
return false;
}
-bool WinSalGraphics::drawAlphaBitmap(
+bool WinSalGraphics::drawAlphaBitmap(
const SalTwoRect& rTR,
- const SalBitmap& rSrcBitmap,
+ const SalBitmap& rSrcBitmap,
const SalBitmap& rAlphaBmp)
{
if(rTR.mnSrcWidth && rTR.mnSrcHeight && rTR.mnDestWidth &&
rTR.mnDestHeight)
@@ -422,15 +424,15 @@ bool WinSalGraphics::drawAlphaBitmap(
Gdiplus::Graphics aGraphics(getHDC());
setInterpolationMode(
- aGraphics,
+ aGraphics,
rTR.mnSrcWidth,
- rTR.mnDestWidth,
+ rTR.mnDestWidth,
rTR.mnSrcHeight,
rTR.mnDestHeight);
paintToGdiPlus(
- aGraphics,
- rTR,
+ aGraphics,
+ rTR,
*aARGB.get());
return true;
@@ -470,13 +472,13 @@ bool WinSalGraphics::drawTransformedBitmap(
Gdiplus::ImageAttributes aAttributes;
setInterpolationMode(
- aGraphics,
+ aGraphics,
nSrcWidth,
- nDestWidth,
+ nDestWidth,
nSrcHeight,
nDestHeight);
- // this mode is only capable of drawing the whole bitmap to a
paralellogram
+ // this mode is only capable of drawing the whole bitmap to a
parallelogram
aDestPoints[0].X = Gdiplus::REAL(rNull.getX());
aDestPoints[0].Y = Gdiplus::REAL(rNull.getY());
aDestPoints[1].X = Gdiplus::REAL(rX.getX());
@@ -487,8 +489,8 @@ bool WinSalGraphics::drawTransformedBitmap(
aAttributes.SetWrapMode(Gdiplus::WrapModeTileFlipXY);
aGraphics.DrawImage(
- aARGB.get(),
- aDestPoints,
+ aARGB.get(),
+ aDestPoints,
3,
Gdiplus::REAL(0.0),
Gdiplus::REAL(0.0),
@@ -507,5 +509,4 @@ bool WinSalGraphics::drawTransformedBitmap(
return false;
}
-// -----------------------------------------------------------------------
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/win/source/window/salframe.cxx
b/main/vcl/win/source/window/salframe.cxx
index 6b6165bbe2..ef036cbd14 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -128,7 +128,7 @@ using namespace ::com::sun::star::beans;
void MyOutputDebugString( char *s) { OutputDebugString( s ); }
#endif
-// misssing prototypes and constants for LayeredWindows
+// missing prototypes and constants for LayeredWindows
extern "C" {
//WINUSERAPI sal_Bool WINAPI
SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
typedef sal_Bool ( WINAPI * SetLayeredWindowAttributes_Proc_T )
(HWND,COLORREF,BYTE,DWORD);
@@ -2959,7 +2959,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
GetSalData()->mbThemeMenuSupport = FALSE;
aStyleSettings.SetMenuColor( ImplWinColorToSal( GetSysColor( COLOR_MENU )
) );
aStyleSettings.SetMenuBarColor( aStyleSettings.GetMenuColor() );
- aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() );
// overriden below for flat menus
+ aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() );
// overridden below for flat menus
aStyleSettings.SetUseFlatBorders( FALSE );
aStyleSettings.SetUseFlatMenues( FALSE );
aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor(
COLOR_MENUTEXT ) ) );
@@ -6486,3 +6486,5 @@ bool WNTEnableAccessInterface(bool bEnable)
return bPreVal;
}
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vos/inc/vos/thread.hxx b/main/vos/inc/vos/thread.hxx
index 13127b5ae3..a957645e9c 100644
--- a/main/vos/inc/vos/thread.hxx
+++ b/main/vos/inc/vos/thread.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -39,11 +39,11 @@ namespace vos
extern "C" typedef void ThreadWorkerFunction_impl(void *);
ThreadWorkerFunction_impl threadWorkerFunction_impl;
-/** OThread is an objectoriented interface for threads.
+/** OThread is an object oriented interface for threads.
This class should be the base class for all objects using threads. The
- main working function is the run() method and should be overriden in the
+ main working function is the run() method and should be overridden in
the
derived class. To support soft termination of a thread, yield() should
- be called in regular intervalls and the return value should be checked.
+ be called in regular intervals and the return value should be checked.
If yield returned False the run method should return.
@author Bernd Hofner
@@ -55,7 +55,7 @@ class VOS_DLLPUBLIC OThread : public vos::IRunnable,
{
VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThread, vos));
-
+
oslCondition m_aCondition;
public:
@@ -71,10 +71,10 @@ public:
TPriority_Unknown = osl_Thread_PriorityUnknown
};
- /**
+ /**
*/
- enum TThreadSleep
- {
+ enum TThreadSleep
+ {
TSleep_Normal,
TSleep_Cancel,
TSleep_Pending,
@@ -85,8 +85,8 @@ public:
typedef oslThreadIdentifier TThreadIdentifier;
- /// Constructor
- OThread();
+ /// Constructor
+ OThread();
/// Destructor kills thread if necessary
virtual ~OThread();
@@ -101,7 +101,7 @@ public:
*/
sal_Bool SAL_CALL createSuspended();
- /// Suspend a runnng thread
+ /// Suspend a running thread
void SAL_CALL suspend();
/// Resume a suspended thread
@@ -121,7 +121,7 @@ public:
/// Check if thread is running.
sal_Bool SAL_CALL isRunning();
- /** Change thread priority.
+ /** Change thread priority.
The valid priority levels are:
<ul>
<li>ThreadPriorityHighest,
@@ -133,7 +133,7 @@ public:
*/
void SAL_CALL setPriority(TThreadPriority Priority);
- /** Query thread priority.
+ /** Query thread priority.
Valid return values are:
<ul>
<li>ThreadPriorityHighest,
@@ -150,25 +150,25 @@ public:
static TThreadIdentifier SAL_CALL getCurrentIdentifier();
- /** Let thread sleep a specified amout of time.
+ /** Let thread sleep a specified amount of time.
@param Delay specifies the number of time to sleep.
*/
TThreadSleep SAL_CALL sleep(const TimeValue& Delay);
- /** Awake the sleeping thread.
- @returns False if at least one of the handles is invalid
- or the thread is not sleeping.
+ /** Awake the sleeping thread.
+ @returns False if at least one of the handles is invalid
+ or the thread is not sleeping.
*/
sal_Bool SAL_CALL awake();
- /** Let current thread wait a specified amout of time.
+ /** Let current thread wait a specified amount of time.
@param Delay specifies the number of time
to wait. Note, if you need to interrupt the waiting operation
use sleep instead.
*/
static void SAL_CALL wait(const TimeValue& Delay);
- /** Reschedules threads.
+ /** Reschedules threads.
Call within your loop if you
want other threads offer some processing time.
This method is static, so it might be used by the
@@ -188,7 +188,7 @@ protected:
*/
virtual sal_Bool SAL_CALL schedule();
- /** Called when run() is done.
+ /** Called when run() is done.
You might want to override it to do some cleanup.
*/
virtual void SAL_CALL onTerminated();
@@ -205,10 +205,10 @@ class VOS_DLLPUBLIC OThreadData : public vos::OObject
VOS_DECLARE_CLASSINFO(VOS_NAMESPACE(OThreadData, vos));
public:
- /// Create a thread specific local data key
- OThreadData( oslThreadKeyCallbackFunction = 0 );
+ /// Create a thread specific local data key
+ OThreadData( oslThreadKeyCallbackFunction = 0 );
- /// Destroy a thread specific local data key
+ /// Destroy a thread specific local data key
virtual ~OThreadData();
/** Set the data associated with the data key.
@@ -217,7 +217,7 @@ public:
sal_Bool SAL_CALL setData(void *pData);
/** Get the data associated with the data key.
- @returns The data asscoitaed with the data key or
+ @returns The data associated with the data key or
NULL if no data was set
*/
void* SAL_CALL getData();
@@ -229,4 +229,3 @@ protected:
}
#endif // _VOS_THREAD_HXX_
-
diff --git a/main/writerfilter/source/doctok/resources.xmi
b/main/writerfilter/source/doctok/resources.xmi
index 784b42efb3..6d42397376 100644
--- a/main/writerfilter/source/doctok/resources.xmi
+++ b/main/writerfilter/source/doctok/resources.xmi
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<XMI xmlns:UML="org.omg.xmi.namespace.UML" xmi.version="1.2">
<XMI.header>
@@ -7178,7 +7178,7 @@
<UML:Attribute name="fFormatting">
<UML:ModelElement.taggedValue>
<UML:TaggedValue>
- <UML:TaggedValue.dataValue>true if the formatting is
overriden (in which case the LFOLVL
+ <UML:TaggedValue.dataValue>true if the formatting is
overridden (in which case the LFOLVL
should contain a pointer to a
LVL)</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
<UML:TagDefinition xmi.idref="comment"/>
@@ -29913,7 +29913,7 @@
<UML:TaggedValue.dataValue>Specifies the size of the
metafile picture for all modes except
the MM_ISOTROPIC and MM_ANISOTROPIC modes. The y-extent
specifies
the height of the rectangle within which the picture is
drawn. The
- coordinates are in units that correspond to the mapping
mode.
+ coordinates are in units that correspond to the mapping mode.
For MM_ISOTROPIC and MM_ANISOTROPIC modes, which can be
scaled,
the xExt and yExt members contain an optional suggested size
in
MM_HIMETRIC units.
