You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/09/04 19:57:25 UTC
(openoffice) branch AOO42X updated (16ddf4da20 -> 287f10d248)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 16ddf4da20 Fix spelling (#409)
new e35eb34d68 Update servicemanager.cxx: Fix `unique` word (#410)
new 287f10d248 Cleanup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/stoc/source/servicemanager/servicemanager.cxx | 2 +-
.../source/text/XMLTextPropertySetContext.cxx | 32 +++++++++++-----------
.../source/text/XMLTextPropertySetContext.hxx | 8 ++----
.../source/text/XMLTextShapeImportHelper.cxx | 14 +++++-----
.../source/text/XMLTextShapeStyleContext.cxx | 24 ++++++++--------
main/xmloff/source/text/XMLTextTableContext.cxx | 5 ++--
.../source/text/XMLTrackedChangesImportContext.cxx | 7 ++---
.../source/text/XMLTrackedChangesImportContext.hxx | 6 ++--
8 files changed, 45 insertions(+), 53 deletions(-)
(openoffice) 02/02: Cleanup
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 287f10d248ba87b3aea331cbf54790bb7b1777bd
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Sep 4 21:54:56 2025 +0200
Cleanup
(cherry picked from commit 25d67f320042549d9d2a4b16f4e1a689a558428b)
---
.../source/text/XMLTextPropertySetContext.cxx | 32 +++++++++++-----------
.../source/text/XMLTextPropertySetContext.hxx | 8 ++----
.../source/text/XMLTextShapeImportHelper.cxx | 14 +++++-----
.../source/text/XMLTextShapeStyleContext.cxx | 24 ++++++++--------
main/xmloff/source/text/XMLTextTableContext.cxx | 5 ++--
.../source/text/XMLTrackedChangesImportContext.cxx | 7 ++---
.../source/text/XMLTrackedChangesImportContext.hxx | 6 ++--
7 files changed, 44 insertions(+), 52 deletions(-)
diff --git a/main/xmloff/source/text/XMLTextPropertySetContext.cxx b/main/xmloff/source/text/XMLTextPropertySetContext.cxx
index 42013be578..2056e389a8 100644
--- a/main/xmloff/source/text/XMLTextPropertySetContext.cxx
+++ b/main/xmloff/source/text/XMLTextPropertySetContext.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
#include <tools/debug.hxx>
@@ -91,7 +89,7 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
case CTF_DROPCAPFORMAT:
{
DBG_ASSERT( rProp.mnIndex >= 2 &&
- CTF_DROPCAPWHOLEWORD == mxMapper->getPropertySetMapper()
+ CTF_DROPCAPWHOLEWORD == mxMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-2 ),
"invalid property map!");
XMLTextDropCapImportContext *pDCContext =
@@ -106,22 +104,22 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
break;
case CTF_BACKGROUND_URL:
- {
+ {
DBG_ASSERT( rProp.mnIndex >= 2 &&
- CTF_BACKGROUND_POS == mxMapper->getPropertySetMapper()
+ CTF_BACKGROUND_POS == mxMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-2 ) &&
- CTF_BACKGROUND_FILTER == mxMapper->getPropertySetMapper()
+ CTF_BACKGROUND_FILTER == mxMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-1 ),
"invalid property map!");
- // #99657# Transparency might be there as well... but doesn't have
- // to. Thus, this is checked with an if, rather than with an assertion.
- sal_Int32 nTranspIndex = -1;
- if( (rProp.mnIndex >= 3) &&
- ( CTF_BACKGROUND_TRANSPARENCY ==
- mxMapper->getPropertySetMapper()->GetEntryContextId(
- rProp.mnIndex-3 ) ) )
- nTranspIndex = rProp.mnIndex-3;
+ // #99657# Transparency might be there as well... but doesn't have
+ // to. Thus, this is checked with an if, rather than with an assertion.
+ sal_Int32 nTranspIndex = -1;
+ if( (rProp.mnIndex >= 3) &&
+ ( CTF_BACKGROUND_TRANSPARENCY ==
+ mxMapper->getPropertySetMapper()->GetEntryContextId(
+ rProp.mnIndex-3 ) ) )
+ nTranspIndex = rProp.mnIndex-3;
pContext =
new XMLBackgroundImageContext( GetImport(), nPrefix,
@@ -131,8 +129,8 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
rProp.mnIndex-1,
nTranspIndex,
rProperties );
- }
- break;
+ }
+ break;
#ifndef SVX_LIGHT
case CTF_SECTION_FOOTNOTE_END:
case CTF_SECTION_ENDNOTE_END:
@@ -150,3 +148,5 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
return pContext;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/xmloff/source/text/XMLTextPropertySetContext.hxx b/main/xmloff/source/text/XMLTextPropertySetContext.hxx
index 112d70a7b1..89f3edc562 100644
--- a/main/xmloff/source/text/XMLTextPropertySetContext.hxx
+++ b/main/xmloff/source/text/XMLTextPropertySetContext.hxx
@@ -19,14 +19,11 @@
*
*************************************************************/
-
-
#ifndef _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
#define _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
#include <xmloff/xmlprcon.hxx>
-
class XMLTextPropertySetContext : public SvXMLPropertySetContext
{
// SvXMLImportContextRef xTabStop;
@@ -46,7 +43,7 @@ public:
virtual ~XMLTextPropertySetContext();
- using SvXMLPropertySetContext::CreateChildContext;
+ using SvXMLPropertySetContext::CreateChildContext;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
@@ -54,5 +51,6 @@ public:
const XMLPropertyState& rProp);
};
+#endif // _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
-#endif // _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/xmloff/source/text/XMLTextShapeImportHelper.cxx b/main/xmloff/source/text/XMLTextShapeImportHelper.cxx
index 78c6f7db29..f58a48ba29 100644
--- a/main/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/main/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
#include <com/sun/star/text/XTextContent.hpp>
@@ -109,17 +107,17 @@ void XMLTextShapeImportHelper::addShape(
case XML_TOK_TEXT_FRAME_ANCHOR_TYPE:
{
TextContentAnchorType eNew;
- // OD 2004-06-01 #i26791# - allow all anchor types
- if ( XMLAnchorTypePropHdl::convert( rValue, eNew ) )
- {
+ // OD 2004-06-01 #i26791# - allow all anchor types
+ if ( XMLAnchorTypePropHdl::convert( rValue, eNew ) )
+ {
eAnchorType = eNew;
- }
+ }
}
break;
case XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER:
{
sal_Int32 nTmp;
- if( rImport.GetMM100UnitConverter().
+ if( rImport.GetMM100UnitConverter().
convertNumber( nTmp, rValue, 1, SHRT_MAX ) )
nPage = (sal_Int16)nTmp;
}
@@ -160,3 +158,5 @@ void XMLTextShapeImportHelper::addShape(
break;
}
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/xmloff/source/text/XMLTextShapeStyleContext.cxx b/main/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 387ee9224d..fa8c8a0a2f 100644
--- a/main/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/main/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
#include <tools/debug.hxx>
@@ -65,12 +63,12 @@ public:
virtual ~XMLTextShapePropertySetContext_Impl();
- using SvXMLPropertySetContext::CreateChildContext;
+ using SvXMLPropertySetContext::CreateChildContext;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList >& xAttrList,
- ::std::vector< XMLPropertyState > &rProperties,
- const XMLPropertyState& rProp);
+ ::std::vector< XMLPropertyState > &rProperties,
+ const XMLPropertyState& rProp);
};
XMLTextShapePropertySetContext_Impl::XMLTextShapePropertySetContext_Impl(
@@ -110,11 +108,11 @@ SvXMLImportContext *XMLTextShapePropertySetContext_Impl::CreateChildContext(
case CTF_BACKGROUND_URL:
DBG_ASSERT( rProp.mnIndex >= 3 &&
CTF_BACKGROUND_TRANSPARENCY ==
- mxMapper->getPropertySetMapper()
+ mxMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-3 ) &&
- CTF_BACKGROUND_POS == mxMapper->getPropertySetMapper()
+ CTF_BACKGROUND_POS == mxMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-2 ) &&
- CTF_BACKGROUND_FILTER == mxMapper->getPropertySetMapper()
+ CTF_BACKGROUND_FILTER == mxMapper->getPropertySetMapper()
->GetEntryContextId( rProp.mnIndex-1 ),
"invalid property map!");
pContext =
@@ -123,7 +121,7 @@ SvXMLImportContext *XMLTextShapePropertySetContext_Impl::CreateChildContext(
rProp,
rProp.mnIndex-2,
rProp.mnIndex-1,
- rProp.mnIndex-3,
+ rProp.mnIndex-3,
rProperties );
break;
}
@@ -144,7 +142,7 @@ void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
if( XML_NAMESPACE_STYLE == nPrefixKey &&
IsXMLToken( rLocalName, XML_AUTO_UPDATE ) )
{
- if( IsXMLToken( rValue, XML_TRUE ) )
+ if( IsXMLToken( rValue, XML_TRUE ) )
bAutoUpdate = sal_True;
}
else
@@ -161,7 +159,7 @@ XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
sal_Bool /*bDefaultStyle*/ ) :
XMLShapeStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles,
- nFamily ),
+ nFamily ),
sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ),
bAutoUpdate( sal_False )
{
@@ -247,5 +245,7 @@ void XMLTextShapeStyleContext::CreateAndInsert( sal_Bool bOverwrite )
void XMLTextShapeStyleContext::Finish( sal_Bool bOverwrite )
{
- XMLPropStyleContext::Finish( bOverwrite );
+ XMLPropStyleContext::Finish( bOverwrite );
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/xmloff/source/text/XMLTextTableContext.cxx b/main/xmloff/source/text/XMLTextTableContext.cxx
index 1f874b483b..9b1800fc50 100644
--- a/main/xmloff/source/text/XMLTextTableContext.cxx
+++ b/main/xmloff/source/text/XMLTextTableContext.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
#include <xmloff/XMLTextTableContext.hxx>
@@ -30,7 +28,6 @@ using ::rtl::OUString;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
-
TYPEINIT1( XMLTextTableContext, SvXMLImportContext );
XMLTextTableContext::XMLTextTableContext(
@@ -43,3 +40,5 @@ XMLTextTableContext::XMLTextTableContext(
XMLTextTableContext::~XMLTextTableContext()
{
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/main/xmloff/source/text/XMLTrackedChangesImportContext.cxx
index 5f9c0d385e..fb7e2d44e4 100644
--- a/main/xmloff/source/text/XMLTrackedChangesImportContext.cxx
+++ b/main/xmloff/source/text/XMLTrackedChangesImportContext.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_xmloff.hxx"
#include "XMLTrackedChangesImportContext.hxx"
@@ -33,15 +31,12 @@
#include <xmloff/xmluconv.hxx>
#include <xmloff/xmltoken.hxx>
-
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::xml::sax::XAttributeList;
using namespace ::xmloff::token;
-
-
TYPEINIT1( XMLTrackedChangesImportContext, SvXMLImportContext );
XMLTrackedChangesImportContext::XMLTrackedChangesImportContext(
@@ -110,3 +105,5 @@ SvXMLImportContext* XMLTrackedChangesImportContext::CreateChildContext(
return pContext;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/main/xmloff/source/text/XMLTrackedChangesImportContext.hxx
index 748f019297..64383b6cf0 100644
--- a/main/xmloff/source/text/XMLTrackedChangesImportContext.hxx
+++ b/main/xmloff/source/text/XMLTrackedChangesImportContext.hxx
@@ -19,16 +19,12 @@
*
*************************************************************/
-
-
-
#ifndef _XMLOFF_XMLTRACKEDCHANGESIMPORTCONTEXT_HXX
#define _XMLOFF_XMLTRACKEDCHANGESIMPORTCONTEXT_HXX
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/uno/Reference.h>
-
namespace com { namespace sun { namespace star {
namespace text {
class XTextRange;
@@ -69,3 +65,5 @@ public:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
(openoffice) 01/02: Update servicemanager.cxx: Fix `unique` word (#410)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit e35eb34d68bc1fd630d53b049f911b33520e6497
Author: Max Base <Ma...@Gmail.Com>
AuthorDate: Thu Sep 4 23:10:45 2025 +0330
Update servicemanager.cxx: Fix `unique` word (#410)
* Update servicemanager.cxx: Fix unique word
* Remove uique from codespell.txt
(cherry picked from commit 35ec22cf77170cb3e63b5d59ec2a3cb506aecd46)
---
main/stoc/source/servicemanager/servicemanager.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/stoc/source/servicemanager/servicemanager.cxx b/main/stoc/source/servicemanager/servicemanager.cxx
index 4ff77445a7..b9e26a50ca 100644
--- a/main/stoc/source/servicemanager/servicemanager.cxx
+++ b/main/stoc/source/servicemanager/servicemanager.cxx
@@ -569,7 +569,7 @@ public:
virtual Reference<XInterface > SAL_CALL createInstance(const OUString &) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual Reference<XInterface > SAL_CALL createInstanceWithArguments(const OUString &, const Sequence<Any >& Arguments) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- // The same as the getAvailableServiceNames, but only uique names
+ // The same as the getAvailableServiceNames, but only unique names
Sequence< OUString > getUniqueAvailableServiceNames(
HashSet_OWString & aNameSet );