[Libreoffice-commits] core.git: 2 commits - cui/source writerfilter/source

[Miklos Vajna]

 cui/source/tabpages/tparea.cxx                        |   15 ------
 writerfilter/source/resourcemodel/sprmcodetostrfooter |    1 
 writerfilter/source/resourcemodel/sprmcodetostrheader |   39 ------------------
 3 files changed, 55 deletions(-)

New commits:
commit de2050c0220d068f9a9d3dc2033bcdc9ec02d5b7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Mar 30 16:14:41 2014 +0200

    writerfilter: unused sprmcodetostr*
    
    Change-Id: Ia35b098033c92fdc7d2313d12b01324ef7232b1f

diff --git a/writerfilter/source/resourcemodel/sprmcodetostrfooter b/writerfilter/source/resourcemodel/sprmcodetostrfooter
deleted file mode 100644
index 5c34318..0000000
--- a/writerfilter/source/resourcemodel/sprmcodetostrfooter
+++ /dev/null
@@ -1 +0,0 @@
-}
diff --git a/writerfilter/source/resourcemodel/sprmcodetostrheader b/writerfilter/source/resourcemodel/sprmcodetostrheader
deleted file mode 100644
index 7df97a4..0000000
--- a/writerfilter/source/resourcemodel/sprmcodetostrheader
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 .
- */
-
-#include <ooxml/resourceids.hxx>
-#include <resourcemodel/QNameToString.hxx>
-
-namespace writerfilter
-{
-
-SprmIdToString::Pointer_t SprmIdToString::pInstance;
-
-SprmIdToString::Pointer_t SprmIdToString::Instance()
-{
-    if (pInstance.get() == NULL)
-        pInstance = SprmIdToString::Pointer_t(new SprmIdToString());
-
-    return pInstance;
-}
-
-string SprmIdToString::operator()(sal_uInt32 nId)
-{
-    return mMap[nId];
-}
-
commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Mar 30 16:09:02 2014 +0200

    cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl
    
    Once again this is unused since commit
    5627d0bdaf1385df9d90dcec3a319c82c089c2ca (Fix #86988#: Redesign of
    dialogs, 2001-05-15), and just getting rid of it avoids a crash on
    Insert -> Frame -> Area -> Color in Writer.
    
    Change-Id: I4e93b8e5f68c229b3093f60b463bb21173dbd0e5

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 408988c..73be1ba 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1825,21 +1825,6 @@ void SvxAreaTabPage::ClickColorHdl_Impl()
     // Controls for Hatch-Background
     m_pFlHatchBckgrd->Hide();
 
-    // set table text
-    OUString        aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString += ": ";
-    INetURLObject   aURL( pColorList->GetPath() );
-
-    aURL.Append( pColorList->GetName() );
-    DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-
-    if( aURL.getBase().getLength() > 18 )
-    {
-        aString += aURL.getBase().copy( 0, 15 );
-        aString += "...";
-    }
-    else
-        aString += aURL.getBase();
-
     ModifyColorHdl_Impl( this );
 }