[Libreoffice-commits] core.git: 4 commits - bin/get-bugzilla-attachments-by-mimetype sc/source sd/source svx/source
Caolán McNamara
caolanm at redhat.com
Wed Apr 16 12:27:18 PDT 2014
bin/get-bugzilla-attachments-by-mimetype | 1
sc/source/core/tool/interpr7.cxx | 6 ---
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 8 ++---
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 25 ++--------------
4 files changed, 9 insertions(+), 31 deletions(-)
New commits:
commit 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 16 20:24:33 2014 +0100
Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tab
Change-Id: I38deeae3135badde23b9d454d548193af654caab
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 97d7aaa..1e65803 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -175,7 +175,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt )
class CustomAnimationCreateTabPage : public TabPage
{
public:
- CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText );
+ CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false );
virtual ~CustomAnimationCreateTabPage();
PathKind getCreatePathKind() const;
@@ -236,7 +236,7 @@ bool ImplStlEffectCategorySortHelper::operator()( const CustomAnimationPresetPtr
return mxCollator->compareString(p1->getLabel(), p2->getLabel()) == -1;
}
-CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText )
+CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath )
: TabPage( pParent, "CustomAnimationCreateTab", "modules/simpress/ui/customanimationcreatetab.ui" )
, mpParent( pDialogParent )
, mnId( nTabId )
@@ -257,7 +257,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus
sal_Int32 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
- if( nTabId == MOTIONPATH )
+ if( bIsMotionPath )
{
mpLBEffects->InsertCategory( sMotionPathLabel );
@@ -524,7 +524,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo
mpTabControl->SetTabPage( mnEmphasisId, mpTabPages[EMPHASIS] );
mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, mnExitId, rPresets.getExitPresets(), bHasText );
mpTabControl->SetTabPage( mnExitId, mpTabPages[EXIT] );
- mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText );
+ mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText, true );
mpTabControl->SetTabPage( mnMPathId, mpTabPages[MOTIONPATH] );
mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMiscId, rPresets.getMiscPresets(), bHasText );
mpTabControl->SetTabPage( mnMiscId, mpTabPages[MISCEFFECTS] );
commit b5fd106f93321fb79e74a4cbcd0ea9a62b6f4474
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 16 16:53:31 2014 +0100
add image/x-sun-raster mimetype
Change-Id: I6c53ec2ae15a68b9fa6bfd0daf81d6a21ca6c457
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 3480713..ce967e2 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -437,6 +437,7 @@ mimetypes = {
'image/x-portable-pixmap': 'ppm',
'image/vnd.adobe.photoshop': 'psd',
'image/x-cmu-raster': 'ras',
+ 'image/x-sun-raster': 'ras',
'image/x-xbitmap': 'xbm',
'image/x-xpixmap': 'xpm',
}
commit 032a127348ff8146bad53ec19c5db47aea5ebdb6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 16 16:29:00 2014 +0100
cppcheck: duplicate branch
Change-Id: I2348a763ba4ba2ae8d00df926d6a1dddceb02b4c
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index c249a55..9ba8cd4 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -96,12 +96,6 @@ void ScInterpreter::ScFilterXML()
boost::shared_ptr<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree);
aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8);
}
- else if(pNodeSet->nodeTab[0]->type == XML_ELEMENT_NODE)
- {
- xmlNodePtr cur = pNodeSet->nodeTab[0];
- boost::shared_ptr<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree);
- aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8);
- }
else
{
xmlNodePtr cur = pNodeSet->nodeTab[0];
commit c89cafb192a8406692bdd0a77634c064786e7ac0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 16 16:15:22 2014 +0100
cppcheck: duplicate branch
Change-Id: I1731b60036d94791a39290957d6c4d3b345c077f
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index be987fb..cb14227 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -264,17 +264,8 @@ void ParaPropertyPanel::InitToolBoxIndent()
const sal_uInt16 nIdIncrement = mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT);
const sal_uInt16 nIdDecrement = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT);
const sal_uInt16 nIdHanging = mpTbxIndent_IncDec->GetItemId(UNO_HANGINGINDENT);
-
- if( Application::GetSettings().GetLayoutRTL())
- {
- mpTbxIndent_IncDec->SetItemImage(nIdIncrement, maIncIndentControl.GetIcon());
- mpTbxIndent_IncDec->SetItemImage(nIdDecrement, maDecIndentControl.GetIcon());
- }
- else
- {
- mpTbxIndent_IncDec->SetItemImage(nIdIncrement, maIncIndentControl.GetIcon());
- mpTbxIndent_IncDec->SetItemImage(nIdDecrement, maDecIndentControl.GetIcon());
- }
+ mpTbxIndent_IncDec->SetItemImage(nIdIncrement, maIncIndentControl.GetIcon());
+ mpTbxIndent_IncDec->SetItemImage(nIdDecrement, maDecIndentControl.GetIcon());
mpTbxIndent_IncDec->SetItemImage(nIdHanging, maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl );
@@ -284,16 +275,8 @@ void ParaPropertyPanel::InitToolBoxIndent()
const sal_uInt16 nIdPromote = mpTbxProDemote->GetItemId(UNO_PROMOTE);
const sal_uInt16 nIdDemote = mpTbxProDemote->GetItemId(UNO_DEMOTE);
const sal_uInt16 nIdHanging2 = mpTbxProDemote->GetItemId(UNO_HANGINGINDENT2);
- if( Application::GetSettings().GetLayoutRTL())
- {
- mpTbxProDemote->SetItemImage(nIdPromote, maOutLineLeftControl.GetIcon());
- mpTbxProDemote->SetItemImage(nIdDemote, maOutLineRightControl.GetIcon());
- }
- else
- {
- mpTbxProDemote->SetItemImage(nIdPromote, maOutLineLeftControl.GetIcon());
- mpTbxProDemote->SetItemImage(nIdDemote, maOutLineRightControl.GetIcon());
- }
+ mpTbxProDemote->SetItemImage(nIdPromote, maOutLineLeftControl.GetIcon());
+ mpTbxProDemote->SetItemImage(nIdDemote, maOutLineRightControl.GetIcon());
mpTbxProDemote->SetItemImage(nIdHanging2, maIndHang);
aLink = LINK( this, ParaPropertyPanel, ClickProDemote_Hdl_Impl );
mpTbxProDemote->SetSelectHdl(aLink);
More information about the Libreoffice-commits
mailing list