[Libreoffice-commits] core.git: 2 commits - sw/inc sw/qa sw/source
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Tue Nov 18 17:27:00 PST 2014
sw/inc/doc.hxx | 42 -------------------
sw/inc/docfunc.hxx | 68 +++++++++++++++++++++++++++++++
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 1
sw/source/core/doc/docdraw.cxx | 1
sw/source/core/doc/docfmt.cxx | 1
sw/source/filter/xml/swxml.cxx | 1
sw/source/filter/xml/wrtxml.cxx | 1
sw/source/uibase/app/docsh.cxx | 1
8 files changed, 73 insertions(+), 43 deletions(-)
New commits:
commit b2efe90c07baa45d2ee7e13138dd306a29738473
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Nov 18 00:51:30 2014 +0100
remove nonsense comment clutter
Change-Id: I9ab33513ffb927b02c27fbd6c115b41702751d18
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a0650a1..27fe3d6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2504,7 +2504,6 @@ DECLARE_OOXMLIMPORT_TEST(testBnc821804, "bnc821804.docx")
DECLARE_OOXMLIMPORT_TEST(testFdo85542, "fdo85542.docx")
{
- //CPPUNIT_ASSERT_EQUAL(false,true);
uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xBookmarksByIdx(xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx->getCount(), static_cast<sal_Int32>(3));
commit 1296f9063203a3f9488689136b833568c183edab
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Nov 17 17:37:56 2014 +0100
move docfunc to own header
Change-Id: I5e1c66e09418e534bb47233f45c67206af20cab4
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 414965d..a7b8829 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1713,48 +1713,6 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
mbAllOLENotify = false;
}
-// namespace <docfunc> for functions and procedures working on a Writer document.
-namespace docfunc
-{
- /** method to check, if given Writer document contains at least one drawing object
-
- @author OD
-
- @param p_rDoc
- input parameter - reference to the Writer document, which is investigated.
- */
- bool ExistsDrawObjs( SwDoc& p_rDoc );
-
- /** method to check, if given Writer document contains only drawing objects,
- which are completely on its page.
-
- @author OD
-
- @param p_rDoc
- input parameter - reference to the Writer document, which is investigated.
- */
- bool AllDrawObjsOnPage( SwDoc& p_rDoc );
-
- /** method to check, if the outline style has to written as a normal list style
-
- #i69627#
- The outline style has to written as a normal list style, if a parent
- paragraph style of one of the paragraph styles, which are assigned to
- the list levels of the outline style, has a list style set or inherits
- a list style from its parent paragraphs style.
- This information is needed for the OpenDocument file format export.
-
- @author OD
-
- @param rDoc
- input parameter - reference to the text document, which is investigated.
-
- @return boolean
- indicating, if the outline style has to written as a normal list style
- */
- bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc );
-}
-
bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst );
#endif //_DOC_HXX
diff --git a/sw/inc/docfunc.hxx b/sw/inc/docfunc.hxx
new file mode 100644
index 0000000..d4d1256
--- /dev/null
+++ b/sw/inc/docfunc.hxx
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * 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 regarding copyright
+ * ownership. The ASF licenses this file 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 .
+ */
+#ifndef INCLUDED_SW_INC_DOCFUNC_HXX
+#define INCLUDED_SW_INC_DOCFUNC_HXX
+
+class SwDoc;
+
+// namespace <docfunc> for functions and procedures working on a Writer document.
+namespace docfunc
+{
+ /** method to check, if given Writer document contains at least one drawing object
+
+ @author OD
+
+ @param p_rDoc
+ input parameter - reference to the Writer document, which is investigated.
+ */
+ bool ExistsDrawObjs( SwDoc& p_rDoc );
+
+ /** method to check, if given Writer document contains only drawing objects,
+ which are completely on its page.
+
+ @author OD
+
+ @param p_rDoc
+ input parameter - reference to the Writer document, which is investigated.
+ */
+ bool AllDrawObjsOnPage( SwDoc& p_rDoc );
+
+ /** method to check, if the outline style has to written as a normal list style
+
+ #i69627#
+ The outline style has to written as a normal list style, if a parent
+ paragraph style of one of the paragraph styles, which are assigned to
+ the list levels of the outline style, has a list style set or inherits
+ a list style from its parent paragraphs style.
+ This information is needed for the OpenDocument file format export.
+
+ @author OD
+
+ @param rDoc
+ input parameter - reference to the text document, which is investigated.
+
+ @return boolean
+ indicating, if the outline style has to written as a normal list style
+ */
+ bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc );
+}
+
+#endif //_DOCFUNC_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 67e7341..5e49e99 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -38,6 +38,7 @@
#include <viewimp.hxx>
#include <swhints.hxx>
#include <doc.hxx>
+#include <docfunc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <DocumentSettingManager.hxx>
#include <IDocumentDeviceAccess.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index dbe7168..3d9cbff 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -37,6 +37,7 @@
#include <fmtcntnt.hxx>
#include <frmatr.hxx>
#include <doc.hxx>
+#include <docfunc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <DocumentContentOperationsManager.hxx>
#include <IDocumentFieldsAccess.hxx>
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 5a6ecec..fddb411 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -50,6 +50,7 @@
#include <fltini.hxx>
#include <drawdoc.hxx>
#include <doc.hxx>
+#include <docfunc.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentRedlineAccess.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index f94ce20..ff27193 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -38,6 +38,7 @@
#include <sfx2/docfile.hxx>
#include <pam.hxx>
#include <doc.hxx>
+#include <docfunc.hxx>
#include <IDocumentRedlineAccess.hxx>
#include <IDocumentStatistics.hxx>
#include <IDocumentLayoutAccess.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index cb68de1..1879e7e 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -71,6 +71,7 @@
#include <shellio.hxx>
#include <docstyle.hxx>
#include <doc.hxx>
+#include <docfunc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentLinksAdministration.hxx>
More information about the Libreoffice-commits
mailing list