[Libreoffice-commits] core.git: 2 commits - icon-themes/crystal icon-themes/human icon-themes/industrial icon-themes/oxygen icon-themes/tango icon-themes/tango_testing sd/source
Ivan Timofeev
timofeev.i.s at gmail.com
Sun Sep 1 03:38:49 PDT 2013
icon-themes/crystal/cmd/lc_fliphorizontal.png |binary
icon-themes/crystal/cmd/lc_flipvertical.png |binary
icon-themes/crystal/cmd/sc_fliphorizontal.png |binary
icon-themes/crystal/cmd/sc_flipvertical.png |binary
icon-themes/human/cmd/lc_fliphorizontal.png |binary
icon-themes/human/cmd/lc_flipvertical.png |binary
icon-themes/human/cmd/sc_fliphorizontal.png |binary
icon-themes/human/cmd/sc_flipvertical.png |binary
icon-themes/industrial/cmd/lc_fliphorizontal.png |binary
icon-themes/industrial/cmd/lc_flipvertical.png |binary
icon-themes/industrial/cmd/sc_fliphorizontal.png |binary
icon-themes/industrial/cmd/sc_flipvertical.png |binary
icon-themes/oxygen/cmd/lc_fliphorizontal.png |binary
icon-themes/oxygen/cmd/lc_flipvertical.png |binary
icon-themes/oxygen/cmd/sc_fliphorizontal.png |binary
icon-themes/oxygen/cmd/sc_flipvertical.png |binary
icon-themes/tango/cmd/lc_fliphorizontal.png |binary
icon-themes/tango/cmd/lc_flipvertical.png |binary
icon-themes/tango/cmd/sc_fliphorizontal.png |binary
icon-themes/tango/cmd/sc_flipvertical.png |binary
icon-themes/tango_testing/cmd/lc_fliphorizontal.png |binary
icon-themes/tango_testing/cmd/lc_fliphorizontal.svg | 3308 ++++++++++++++++++++
icon-themes/tango_testing/cmd/lc_flipvertical.png |binary
icon-themes/tango_testing/cmd/lc_flipvertical.svg | 3308 --------------------
sd/source/ui/dlg/sdtreelb.cxx | 55
sd/source/ui/inc/sdtreelb.hxx | 15
26 files changed, 3342 insertions(+), 3344 deletions(-)
New commits:
commit 07aefbe310cad43bf9a71ba073486cddd7e062f2
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Sun Sep 1 10:08:38 2013 +0400
fdo#42434: swap flipvertical and fliphorizontal icons in some themes
Change-Id: I484a783547c3bed1d80a0f510434b4c0fe37bed7
diff --git a/icon-themes/crystal/cmd/lc_fliphorizontal.png b/icon-themes/crystal/cmd/lc_fliphorizontal.png
index 6eed975..5440863 100644
Binary files a/icon-themes/crystal/cmd/lc_fliphorizontal.png and b/icon-themes/crystal/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/crystal/cmd/lc_flipvertical.png b/icon-themes/crystal/cmd/lc_flipvertical.png
index 5440863..6eed975 100644
Binary files a/icon-themes/crystal/cmd/lc_flipvertical.png and b/icon-themes/crystal/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/crystal/cmd/sc_fliphorizontal.png b/icon-themes/crystal/cmd/sc_fliphorizontal.png
index 73f6b0e..f16cf5e 100644
Binary files a/icon-themes/crystal/cmd/sc_fliphorizontal.png and b/icon-themes/crystal/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/crystal/cmd/sc_flipvertical.png b/icon-themes/crystal/cmd/sc_flipvertical.png
index f16cf5e..73f6b0e 100644
Binary files a/icon-themes/crystal/cmd/sc_flipvertical.png and b/icon-themes/crystal/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/human/cmd/lc_fliphorizontal.png b/icon-themes/human/cmd/lc_fliphorizontal.png
index b02e1fd..116cad6 100644
Binary files a/icon-themes/human/cmd/lc_fliphorizontal.png and b/icon-themes/human/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/human/cmd/lc_flipvertical.png b/icon-themes/human/cmd/lc_flipvertical.png
index 116cad6..b02e1fd 100644
Binary files a/icon-themes/human/cmd/lc_flipvertical.png and b/icon-themes/human/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/human/cmd/sc_fliphorizontal.png b/icon-themes/human/cmd/sc_fliphorizontal.png
index 9a2994b..901b218 100644
Binary files a/icon-themes/human/cmd/sc_fliphorizontal.png and b/icon-themes/human/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/human/cmd/sc_flipvertical.png b/icon-themes/human/cmd/sc_flipvertical.png
index 901b218..9a2994b 100644
Binary files a/icon-themes/human/cmd/sc_flipvertical.png and b/icon-themes/human/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/industrial/cmd/lc_fliphorizontal.png b/icon-themes/industrial/cmd/lc_fliphorizontal.png
index ef1c256..a972d2c 100644
Binary files a/icon-themes/industrial/cmd/lc_fliphorizontal.png and b/icon-themes/industrial/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/industrial/cmd/lc_flipvertical.png b/icon-themes/industrial/cmd/lc_flipvertical.png
index a972d2c..ef1c256 100644
Binary files a/icon-themes/industrial/cmd/lc_flipvertical.png and b/icon-themes/industrial/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/industrial/cmd/sc_fliphorizontal.png b/icon-themes/industrial/cmd/sc_fliphorizontal.png
index 761d90e..1744b76 100644
Binary files a/icon-themes/industrial/cmd/sc_fliphorizontal.png and b/icon-themes/industrial/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/industrial/cmd/sc_flipvertical.png b/icon-themes/industrial/cmd/sc_flipvertical.png
index 1744b76..761d90e 100644
Binary files a/icon-themes/industrial/cmd/sc_flipvertical.png and b/icon-themes/industrial/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/oxygen/cmd/lc_fliphorizontal.png b/icon-themes/oxygen/cmd/lc_fliphorizontal.png
index 6828b4d..8e39935 100644
Binary files a/icon-themes/oxygen/cmd/lc_fliphorizontal.png and b/icon-themes/oxygen/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/oxygen/cmd/lc_flipvertical.png b/icon-themes/oxygen/cmd/lc_flipvertical.png
index 8e39935..6828b4d 100644
Binary files a/icon-themes/oxygen/cmd/lc_flipvertical.png and b/icon-themes/oxygen/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/oxygen/cmd/sc_fliphorizontal.png b/icon-themes/oxygen/cmd/sc_fliphorizontal.png
index c9a7442..6b428d0 100644
Binary files a/icon-themes/oxygen/cmd/sc_fliphorizontal.png and b/icon-themes/oxygen/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/oxygen/cmd/sc_flipvertical.png b/icon-themes/oxygen/cmd/sc_flipvertical.png
index 6b428d0..c9a7442 100644
Binary files a/icon-themes/oxygen/cmd/sc_flipvertical.png and b/icon-themes/oxygen/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/tango/cmd/lc_fliphorizontal.png b/icon-themes/tango/cmd/lc_fliphorizontal.png
index 18c215f..cdb2b84 100644
Binary files a/icon-themes/tango/cmd/lc_fliphorizontal.png and b/icon-themes/tango/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/tango/cmd/lc_flipvertical.png b/icon-themes/tango/cmd/lc_flipvertical.png
index cdb2b84..18c215f 100644
Binary files a/icon-themes/tango/cmd/lc_flipvertical.png and b/icon-themes/tango/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/tango/cmd/sc_fliphorizontal.png b/icon-themes/tango/cmd/sc_fliphorizontal.png
index 9569613..097a593 100644
Binary files a/icon-themes/tango/cmd/sc_fliphorizontal.png and b/icon-themes/tango/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/tango/cmd/sc_flipvertical.png b/icon-themes/tango/cmd/sc_flipvertical.png
index 097a593..9569613 100644
Binary files a/icon-themes/tango/cmd/sc_flipvertical.png and b/icon-themes/tango/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/tango_testing/cmd/lc_fliphorizontal.png b/icon-themes/tango_testing/cmd/lc_fliphorizontal.png
index 0f67fdf..abb0389 100644
Binary files a/icon-themes/tango_testing/cmd/lc_fliphorizontal.png and b/icon-themes/tango_testing/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/tango_testing/cmd/lc_flipvertical.svg b/icon-themes/tango_testing/cmd/lc_fliphorizontal.svg
similarity index 100%
rename from icon-themes/tango_testing/cmd/lc_flipvertical.svg
rename to icon-themes/tango_testing/cmd/lc_fliphorizontal.svg
diff --git a/icon-themes/tango_testing/cmd/lc_flipvertical.png b/icon-themes/tango_testing/cmd/lc_flipvertical.png
index abb0389..0f67fdf 100644
Binary files a/icon-themes/tango_testing/cmd/lc_flipvertical.png and b/icon-themes/tango_testing/cmd/lc_flipvertical.png differ
commit 0fa3e9e3254634b2682604d4d6d710c835163123
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Fri Aug 30 20:04:32 2013 +0400
convert SdPageObjsTLB to OUString
Change-Id: Iad3f3a70ccf2d47add5ce7f0c8f9dfa85789a251
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 965a452..4a8576b 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -253,27 +253,27 @@ SdPageObjsTLB::~SdPageObjsTLB()
delete mpMedium;
}
-String SdPageObjsTLB::GetObjectName(
+OUString SdPageObjsTLB::GetObjectName(
const SdrObject* pObject,
const bool bCreate) const
{
- String aRet;
+ OUString aRet;
if ( pObject )
{
aRet = pObject->GetName();
- if( !aRet.Len() && pObject->ISA( SdrOle2Obj ) )
+ if (aRet.isEmpty() && pObject->ISA(SdrOle2Obj))
aRet = static_cast< const SdrOle2Obj* >( pObject )->GetPersistName();
}
if (bCreate
&& mbShowAllShapes
- && aRet.Len() == 0
+ && aRet.isEmpty()
&& pObject!=NULL)
{
aRet = SD_RESSTR(STR_NAVIGATOR_SHAPE_BASE_NAME);
- aRet.SearchAndReplaceAscii("%1", OUString::number(pObject->GetOrdNum() + 1));
+ aRet = aRet.replaceFirst("%1", OUString::number(pObject->GetOrdNum() + 1));
}
return aRet;
@@ -282,14 +282,14 @@ String SdPageObjsTLB::GetObjectName(
/**
* select a entry in TreeLB
*/
-sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
+sal_Bool SdPageObjsTLB::SelectEntry( const OUString& rName )
{
sal_Bool bFound = sal_False;
- if( rName.Len() )
+ if( !rName.isEmpty() )
{
SvTreeListEntry* pEntry = NULL;
- String aTmp;
+ OUString aTmp;
for( pEntry = First(); pEntry && !bFound; pEntry = Next( pEntry ) )
{
@@ -307,15 +307,15 @@ sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
/**
* @return true if children of the specified string are selected
*/
-sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
+sal_Bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName )
{
sal_Bool bFound = sal_False;
sal_Bool bChildren = sal_False;
- if( rName.Len() )
+ if( !rName.isEmpty() )
{
SvTreeListEntry* pEntry = NULL;
- String aTmp;
+ OUString aTmp;
for( pEntry = First(); pEntry && !bFound; pEntry = Next( pEntry ) )
{
@@ -338,9 +338,9 @@ sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
* Fill TreeLB with pages and objects
*/
void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
- const String& rDocName)
+ const OUString& rDocName)
{
- String aSelection;
+ OUString aSelection;
if( GetSelectionCount() > 0 )
{
aSelection = GetSelectEntry();
@@ -389,7 +389,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
nPage++;
}
}
- if( aSelection.Len() )
+ if( !aSelection.isEmpty() )
SelectEntry( aSelection );
}
@@ -397,7 +397,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages,
* We insert only the first entry. Children are created on demand.
*/
void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
- const String& rDocName )
+ const OUString& rDocName )
{
mpDoc = pInDoc;
@@ -456,9 +456,9 @@ void SdPageObjsTLB::AddShapeList (
OSL_ASSERT(pObj!=NULL);
// Get the shape name.
- String aStr (GetObjectName( pObj ) );
+ OUString aStr (GetObjectName( pObj ) );
- if( aStr.Len() )
+ if( !aStr.isEmpty() )
{
if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 )
{
@@ -566,7 +566,7 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
SdrObject* pObj = NULL;
SdPage* pPage = NULL;
SvTreeListEntry* pEntry = First();
- String aName;
+ OUString aName;
// compare all pages including the objects
sal_uInt16 nPage = 0;
@@ -595,9 +595,9 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
{
pObj = aIter.Next();
- const String aObjectName( GetObjectName( pObj ) );
+ const OUString aObjectName( GetObjectName( pObj ) );
- if( aObjectName.Len() )
+ if( !aObjectName.isEmpty() )
{
if( !pEntry )
return( sal_False );
@@ -621,7 +621,7 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
/**
* @return selected string
*/
-String SdPageObjsTLB::GetSelectEntry()
+OUString SdPageObjsTLB::GetSelectEntry()
{
return( GetEntryText( GetCurEntry() ) );
}
@@ -685,8 +685,8 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry )
while( aIter.IsMore() )
{
pObj = aIter.Next();
- String aStr( GetObjectName( pObj ) );
- if( aStr.Len() )
+ OUString aStr( GetObjectName( pObj ) );
+ if( !aStr.isEmpty() )
{
if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 )
{
@@ -910,11 +910,10 @@ void SdPageObjsTLB::DoDrag()
if( mpDropNavWin )
{
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
- String aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INET_PROT_FILE ).GetMainURL( INetURLObject::NO_DECODE );
+ OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INET_PROT_FILE ).GetMainURL( INetURLObject::NO_DECODE );
NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType();
- aURL.Append( '#' );
- aURL.Append( GetSelectEntry() );
+ aURL += "#" + GetSelectEntry();
INetBookmark aBookmark( aURL, GetSelectEntry() );
sal_Int8 nDNDActions = DND_ACTION_COPYMOVE;
@@ -967,7 +966,7 @@ void SdPageObjsTLB::DoDrag()
// For shapes without a user supplied name (the automatically
// created name does not count), a different drag and drop technique
// is used.
- if (GetObjectName(pObject, false).Len() == 0)
+ if (GetObjectName(pObject, false).isEmpty())
{
AddShapeToTransferable(*pTransferable, *pObject);
pTransferable->SetView(pView);
@@ -1291,7 +1290,7 @@ void SdPageObjsTLB::AddShapeToTransferable (
if (pDocShell != NULL)
aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass();
else
- aObjectDescriptor.maDisplayName = String();
+ aObjectDescriptor.maDisplayName = OUString();
aObjectDescriptor.mbCanLink = sal_False;
rTransferable.SetStartPos(aDragPos);
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index e863aff..cb448da 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -25,7 +25,6 @@
#include "sdresid.hxx"
#include "pres.hxx"
#include "sddllapi.h"
-#include <tools/string.hxx>
#include <svtools/treelistbox.hxx>
#include <svl/urlbmk.hxx>
#include <tools/ref.hxx>
@@ -128,7 +127,7 @@ protected:
Image maImgGraphic;
sal_Bool mbLinkableSelected;
sal_Bool mbDragEnabled;
- String maDocName;
+ OUString maDocName;
::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks
::sd::DrawDocShell* mpDropDocSh;
SdNavigatorWin* mpDropNavWin;
@@ -159,7 +158,7 @@ protected:
whether a name is created. When a name is created then this
name is not stored in the object.
*/
- String GetObjectName (
+ OUString GetObjectName (
const SdrObject* pObject,
const bool bCreate = true) const;
void CloseBookmarkDoc();
@@ -189,14 +188,14 @@ public:
void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; }
SfxViewFrame* GetViewFrame() const { return mpFrame; }
- void Fill( const SdDrawDocument*, sal_Bool bAllPages, const String& rDocName );
- void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName );
+ void Fill( const SdDrawDocument*, sal_Bool bAllPages, const OUString& rDocName );
+ void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName );
void SetShowAllShapes (const bool bShowAllShapes, const bool bFill);
bool GetShowAllShapes (void) const;
sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL );
- sal_Bool HasSelectedChildren( const String& rName );
- sal_Bool SelectEntry( const String& rName );
- String GetSelectEntry();
+ sal_Bool HasSelectedChildren( const OUString& rName );
+ sal_Bool SelectEntry( const OUString& rName );
+ OUString GetSelectEntry();
/** return selected entries
nDepth == 0 -> pages
More information about the Libreoffice-commits
mailing list