[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - oox/source sw/source writerfilter/source

[Oliver-Rainer Wittmann]

 oox/source/xls/worksheethelper.cxx                |   20 --------------------
 sw/source/core/unocore/unoidx.cxx                 |   20 ++++++++++++++++++++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 67ddd5bd3a66f2b440c651d1d073131a59a57f77
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Jan 2 11:19:29 2014 +0000

    123910: removing duplicate code

diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx
index 0f84cad..8174341 100644
--- a/oox/source/xls/worksheethelper.cxx
+++ b/oox/source/xls/worksheethelper.cxx
@@ -1093,26 +1093,6 @@ void WorksheetGlobals::finalizeValidationRanges() const
             {
             }
 
-            try
-            {
-                sal_Int32 nIndex = 0;
-                OUString aToken = aIt->msRef.getToken( 0, ' ', nIndex );
-
-                Reference<XSpreadsheet> xSheet = getSheetFromDoc( getCurrentSheetIndex() );
-                Reference<XCellRange> xDBCellRange;
-                Reference<XCell> xCell;
-                xDBCellRange = xSheet->getCellRangeByName( aToken );
-
-                xCell = xDBCellRange->getCellByPosition( 0, 0 );
-                Reference<XCellAddressable> xCellAddressable( xCell, UNO_QUERY_THROW );
-                CellAddress aFirstCell = xCellAddressable->getCellAddress();
-                Reference<XSheetCondition> xCondition( xValidation, UNO_QUERY_THROW );
-                xCondition->setSourcePosition( aFirstCell );
-            }
-            catch( Exception& )
-            {
-            }
-
             // convert validation type to API enum
             ValidationType eType = ValidationType_ANY;
             switch( aIt->mnType )
commit 875f8fb79613875296139a6cbdbae265a92d7a32
Author: Steve Yin <steve_y at apache.org>
Date:   Thu Jan 2 10:46:03 2014 +0000

    Bug 119568 - [From Symphony] The page number of the TOC is not correct if open the .docx via AOO

diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index eb4c251..be0572b 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -67,6 +67,7 @@
 #include <chpfld.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <unoevtlstnr.hxx>
+#include <editsh.hxx>
 
 
 using namespace ::com::sun::star;
@@ -583,6 +584,21 @@ throw (uno::RuntimeException)
 /*-- 14.12.98 09:35:05---------------------------------------------------
 
   -----------------------------------------------------------------------*/
+void lcl_CalcLayout(SwDoc *pDoc)
+{
+    ViewShell *pViewShell = 0;
+    SwEditShell* pEditShell = pDoc ? pDoc->GetEditShell(&pViewShell) : 0;
+    if (pEditShell)
+    {
+        pEditShell->CalcLayout();
+    }
+    else if (pViewShell)
+    {
+        pViewShell->CalcLayout();
+    }
+
+}
+
 void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException)
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
@@ -595,6 +611,10 @@ void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException)
         throw uno::RuntimeException();
     }
     pTOXBase->Update();
+
+    // the insertion of TOC will affect the document layout
+    lcl_CalcLayout(m_pImpl->m_pDoc);
+
     // page numbers
     pTOXBase->UpdatePageNum();
 }
commit e3a84634fd6a033b838485346c274552d5bd8d8c
Author: Steve Yin <steve_y at apache.org>
Date:   Thu Jan 2 10:17:34 2014 +0000

    Bug 119577 - [From Symphony] The "file name" field change to "file name without extension" in AOO 3.4

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a0380f9..eab3b0b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3078,7 +3078,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                         sal_Int32 nNumberingTypeIndex = pContext->GetCommand().indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\p")));
                         xFieldProperties->setPropertyValue(
                                 rPropNameSupplier.GetName(PROP_FILE_FORMAT),
-                                uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME ));
+                                uno::makeAny( nNumberingTypeIndex > 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME_AND_EXT ));
                     }
                     break;
                     case FIELD_FILESIZE     : break;