[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/normalize-template-paths-fix.diff |   22 +++++-----------------
 patches/dev300/svx-fix-fit-to-frame-crash.diff   |   13 ++-----------
 2 files changed, 7 insertions(+), 28 deletions(-)

New commits:
commit 1394abcf9f9eee815038953834a79ab3acb1129a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 6 21:56:04 2011 +0300

    Make normalize-template-paths-fix.diff apply again

diff --git a/patches/dev300/normalize-template-paths-fix.diff b/patches/dev300/normalize-template-paths-fix.diff
index 049ebc2..8d83e9b 100644
--- a/patches/dev300/normalize-template-paths-fix.diff
+++ b/patches/dev300/normalize-template-paths-fix.diff
@@ -1,10 +1,3 @@
----
- .../officeinstallationdirectories.cxx              |   12 +++---
- sfx2/source/doc/doctemplates.cxx                   |   35 ++++++++++++++++++++
- 2 files changed, 41 insertions(+), 6 deletions(-)
-
-diff --git comphelper/source/officeinstdir/officeinstallationdirectories.cxx comphelper/source/officeinstdir/officeinstallationdirectories.cxx
-index bd61880..d9ef725 100644
 --- comphelper/source/officeinstdir/officeinstallationdirectories.cxx
 +++ comphelper/source/officeinstdir/officeinstallationdirectories.cxx
 @@ -159,9 +159,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
@@ -12,11 +5,11 @@ index bd61880..d9ef725 100644
          {
              return rtl::OUString(
 -                URL.replaceAt( nIndex,
--                               m_pOfficeDir->getLength(),
--                               m_aOfficeDirMacro ) );
+-                               m_pOfficeBrandDir->getLength(),
+-                               m_aOfficeBrandDirMacro ) );
 +                aCanonicalURL.replaceAt( nIndex,
-+                                         m_pOfficeDir->getLength(),
-+                                         m_aOfficeDirMacro ) );
++                                         m_pOfficeBrandDir->getLength(),
++                                         m_aOfficeBrandDirMacro ) );
          }
          else
          {
@@ -33,8 +26,6 @@ index bd61880..d9ef725 100644
              }
          }
      }
-diff --git sfx2/source/doc/doctemplates.cxx sfx2/source/doc/doctemplates.cxx
-index f33d3dd..b6950e6 100644
 --- sfx2/source/doc/doctemplates.cxx
 +++ sfx2/source/doc/doctemplates.cxx
 @@ -48,6 +48,7 @@
@@ -74,7 +65,7 @@ index f33d3dd..b6950e6 100644
 +                    "Unable to obtain macro expander singleton!" );
 +    }
 +
-     for ( USHORT i=0; i<nCount; i++ )
+     for ( sal_uInt16 i=0; i<nCount; i++ )
      {
          aURL.SetSmartProtocol( INET_PROT_FILE );
          aURL.SetURL( aDirs.GetToken( i, C_DELIM ) );
@@ -91,6 +82,3 @@ index f33d3dd..b6950e6 100644
      }
  
      aValue <<= maTemplateDirs;
--- 
-1.7.0.1
-
commit 594474c8e7f418d805985c8597ae3db49d5c4faf
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 6 21:52:06 2011 +0300

    Make svx-fix-fit-to-frame-crash.diff apply again

diff --git a/patches/dev300/svx-fix-fit-to-frame-crash.diff b/patches/dev300/svx-fix-fit-to-frame-crash.diff
index d217fb6..2de1f9a 100644
--- a/patches/dev300/svx-fix-fit-to-frame-crash.diff
+++ b/patches/dev300/svx-fix-fit-to-frame-crash.diff
@@ -1,20 +1,11 @@
----
- editeng/source/editeng/impedit3.cxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit3.cxx
-index 0511385..8ed92e7 100644
 --- editeng/source/editeng/impedit3.cxx
 +++ editeng/source/editeng/impedit3.cxx
 @@ -946,7 +946,7 @@ sal_Bool ImpEditEngine::CreateLines( USHORT nPara, sal_uInt32 nStartPosY )
- //						nCurPos -= rLRItem.GetTxtLeft();	// Tabs relativ zu LI
-                         // Skalierung rausrechnen
+                         long nCurPos = nTmpWidth+nStartX;
+                         // consider scaling
                          if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
 -                            nCurPos = nCurPos*100/nStretchX;
 +                            nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1));
  
                          short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
                          aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
--- 
-1.7.0.1
-