dbaccess/UIConfig_dbaccess.mk | 1
dbaccess/source/ui/browser/sbagrid.cxx | 23 ++----
dbaccess/source/ui/browser/sbagrid.src | 64 +++++-------------
dbaccess/source/ui/inc/dbu_resource.hrc | 12 +--
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 18 +----
dbaccess/source/ui/querydesign/query.src | 23 ------
dbaccess/source/ui/tabledesign/TEditControl.cxx | 13 +--
dbaccess/uiconfig/ui/querycolmenu.ui | 31 ++++++++
include/svtools/insdlg.hxx | 2
sw/source/core/frmedt/fews.cxx | 13 ++-
vcl/source/gdi/svgdata.cxx | 8 +-
11 files changed, 95 insertions(+), 113 deletions(-)
New commits:
commit 5ce387c4812466e6752b434cf0f5a54f98c6a147
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 16:55:37 2017 +0100
Resolves: tdf#102286 lets not crash on null pFrame
this is the FlyEmbeddedPrt case
ensure we don't end up with a null pFrame at return time
Change-Id: I68ff6f0a36462cffc47d774865e69041c4dd15a8
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 473c324b0b39..44384a5a9ec2 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -125,12 +125,14 @@ const SwRect& SwFEShell::GetAnyCurRect( CurRectType
eType, const Point* pPt,
bFrame = false;
SAL_FALLTHROUGH;
case CurRectType::FlyEmbedded:
- pFrame = xObj.is() ? FindFlyFrame( xObj )
+ {
+ const SwFrame *pFlyFrame = xObj.is() ?
FindFlyFrame(xObj) : nullptr;
+ pFrame = pFlyFrame ? pFlyFrame
: pFrame->IsFlyFrame()
? pFrame
: pFrame->FindFlyFrame();
break;
-
+ }
case CurRectType::SectionOutsideTable :
if( pFrame->IsInTab() )
pFrame = pFrame->FindTabFrame();
commit a7d008a8dfdc0a8b42061329b5e756b1b034abaf
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 16:18:22 2017 +0100
Resolves: tdf#106732 the intent was surely to return a const ref
Change-Id: Iaaa1f76a689645adaebf4fe5b87003ad238f71f2
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 5e18693663b3..58bada8fadd2 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -60,7 +60,7 @@ public:
return aObjectServerList.size();
}
- const SvObjectServer operator[]( size_t n ) const
+ const SvObjectServer& operator[]( size_t n ) const
{
return aObjectServerList[ n ];
}
commit ebd43aee5b9cf98ed96ce28985267ad0bc980b7a
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 13:41:38 2017 +0100
rework setting hidden property on line break
to avoid the assert in InsertItem, I guess that was the wrong way
to do it then.
Change-Id: Icd30ced1d2598ec42d3e5f555360f5d2377515c1
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 6cd9d88a398a..473c324b0b39 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -494,12 +494,11 @@ void SwFEShell::InsertLabel( const SwLabelType eType,
const OUString &rText, con
aAnc.SetAnchor(&aPos);
- SfxItemSet
aSet(makeItemSetFromFormatAnchor(GetDoc()->GetAttrPool(), aAnc));
-
SwFlyFrame *pFly = GetSelectedOrCurrFlyFrame();
OSL_ENSURE(pFly, "SetFlyFrameAttr, no Fly selected.");
if (pFly)
{
+ SfxItemSet
aSet(makeItemSetFromFormatAnchor(GetDoc()->GetAttrPool(), aAnc));
SwFlyFrameFormat* pInnerFlyFormat = pFly->GetFormat();
GetDoc()->SetFlyFrameAttr(*pInnerFlyFormat, aSet);
}
@@ -513,7 +512,9 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const
OUString &rText, con
//the next line, pushing the caption text out of
//the frame making the caption apparently disappear
SvxCharHiddenItem aHidden(true, RES_CHRATR_HIDDEN);
- pTextNode->InsertItem(aHidden, nIndex, nIndex + 1);
+ SfxItemSet aSet(GetDoc()->GetAttrPool(), aHidden.Which(),
aHidden.Which());
+ aSet.Put(aHidden);
+ pTextNode->SetAttr(aSet, nIndex, nIndex + 1);
}
}
commit 3e1977abc648a0b30be7af3c10060938de1b143f
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 11:02:54 2017 +0100
convert RID_QUERYCOLPOPUPMENU to .ui format
Change-Id: Idcf8566db964c475a0b9049f215af6fc57f0978b
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index c62fb19ff4be..e6a2a8fe5f14 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/parametersdialog \
dbaccess/uiconfig/ui/password \
dbaccess/uiconfig/ui/preparepage \
+ dbaccess/uiconfig/ui/querycolmenu \
dbaccess/uiconfig/ui/queryfilterdialog \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/relationdialog \
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 0121edb0a3ef..574042ef9616 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -123,7 +123,6 @@
// menus
-#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5
#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6
#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7
#define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 496ced84a687..308f238f8f4e 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1940,17 +1940,13 @@ void OSelectionBrowseBox::Command(const CommandEvent&
rEvt)
if
(!static_cast<OQueryController&>(getDesignView()->getController()).isReadOnly())
{
- ScopedVclPtrInstance<PopupMenu> aContextMenu( ModuleRes(
RID_QUERYCOLPOPUPMENU ) );
- switch (aContextMenu->Execute(this, aMenuPos))
- {
- case SID_DELETE:
- RemoveField(nColId);
- break;
-
- case ID_BROWSER_COLWIDTH:
- adjustBrowseBoxColumnWidth( this, nColId );
- break;
- }
+ VclBuilder aBuilder(nullptr,
VclBuilderContainer::getUIRootDir(), "dbaccess/ui/querycolmenu.ui", "");
+ VclPtr<PopupMenu> aContextMenu(aBuilder.get_menu("menu"));
+ sal_uInt16 nItemId = aContextMenu->Execute(this, aMenuPos);
+ if (nItemId == aContextMenu->GetItemId("delete"))
+ RemoveField(nColId);
+ else if (nItemId == aContextMenu->GetItemId("width"))
+ adjustBrowseBoxColumnWidth( this, nColId );
}
}
else if(nRow >= 0 && nColId <= HANDLE_ID)
diff --git a/dbaccess/source/ui/querydesign/query.src
b/dbaccess/source/ui/querydesign/query.src
index 7530f5d0948f..f84fce531999 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -53,29 +53,6 @@ Menu RID_MENU_JOINVIEW_TABLE
};
};
-Menu RID_QUERYCOLPOPUPMENU
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = ID_BROWSER_COLWIDTH ;
- HelpID = HID_BROWSER_COLUMNWIDTH ;
- Text [ en-US ] = "Column ~Width..." ;
- };
- MenuItem
- {
- Separator = TRUE ;
- };
- MenuItem
- {
- Identifier = SID_DELETE ;
- Command = ".uno:Delete" ;
- Text [ en-US ] = "~Delete" ;
- };
- };
-};
-
Bitmap BMP_PRIMARY_KEY
{
File = "jo01.png";
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index d62b5cbd844c..5a5b7bd87bdf 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1361,15 +1361,12 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
if ( !IsColumnSelected( nColId ) )
SelectColumnId( nColId );
- ScopedVclPtrInstance<PopupMenu> aContextMenu(
ModuleRes( RID_QUERYCOLPOPUPMENU ) );
- aContextMenu->EnableItem( SID_DELETE, false );
+ VclBuilder aBuilder(nullptr,
VclBuilderContainer::getUIRootDir(), "dbaccess/ui/querycolmenu.ui", "");
+ VclPtr<PopupMenu>
aContextMenu(aBuilder.get_menu("menu"));
+
aContextMenu->EnableItem(aContextMenu->GetItemId("delete"), false);
aContextMenu->RemoveDisabledEntries(true, true);
- switch ( aContextMenu->Execute( this, aMenuPos ) )
- {
- case ID_BROWSER_COLWIDTH:
- adjustBrowseBoxColumnWidth( this, nColId );
- break;
- }
+ if (aContextMenu->Execute(this, aMenuPos) ==
aContextMenu->GetItemId("width"))
+ adjustBrowseBoxColumnWidth( this, nColId );
}
}
}
diff --git a/dbaccess/uiconfig/ui/querycolmenu.ui
b/dbaccess/uiconfig/ui/querycolmenu.ui
new file mode 100644
index 000000000000..8044db9e1d95
--- /dev/null
+++ b/dbaccess/uiconfig/ui/querycolmenu.ui
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface>
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkMenu" id="menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="width">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Column _Width...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="menuitem1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="delete">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Delete</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+</interface>
commit 132307c089936ba39468a7957577866ab59904fc
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 10:44:41 2017 +0100
RID_SBA_GRID_COLCTXMENU has the same odd pattern
Change-Id: Ie05b8d0fe706656f9d9fb66b43af11fac87c8d46
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index 8d621a054191..a3ee13ac737d 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -648,7 +648,6 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16
nColId, PopupMenu& rM
bool bColAttrs = (nColId != (sal_uInt16)-1) && (nColId != 0);
if ( bColAttrs && !bDBIsReadOnly)
{
- ScopedVclPtrInstance<PopupMenu>
aNewItems(ModuleRes(RID_SBA_GRID_COLCTXMENU));
sal_uInt16 nPos = 0;
sal_uInt16 nModelPos =
static_cast<SbaGridControl*>(GetParent())->GetModelColumnPos(nColId);
Reference< XPropertySet > xField =
static_cast<SbaGridControl*>(GetParent())->getField(nModelPos);
@@ -667,14 +666,14 @@ void
SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
case DataType::REF:
break;
default:
- rMenu.InsertItem(ID_BROWSER_COLATTRSET,
aNewItems->GetItemText(ID_BROWSER_COLATTRSET), MenuItemBits::NONE, OString(),
nPos++);
- rMenu.SetHelpId(ID_BROWSER_COLATTRSET,
aNewItems->GetHelpId(ID_BROWSER_COLATTRSET));
+ rMenu.InsertItem(ID_BROWSER_COLATTRSET,
ModuleRes(RID_STR_COLUMN_FORMAT).toString(), MenuItemBits::NONE, OString(),
nPos++);
+ rMenu.SetHelpId(ID_BROWSER_COLATTRSET,
HID_BROWSER_COLUMNFORMAT);
rMenu.InsertSeparator(OString(), nPos++);
}
}
- rMenu.InsertItem(ID_BROWSER_COLWIDTH,
aNewItems->GetItemText(ID_BROWSER_COLWIDTH), MenuItemBits::NONE, OString(),
nPos++);
- rMenu.SetHelpId(ID_BROWSER_COLWIDTH,
aNewItems->GetHelpId(ID_BROWSER_COLWIDTH));
+ rMenu.InsertItem(ID_BROWSER_COLWIDTH,
ModuleRes(RID_STR_COLUMN_WIDTH).toString(), MenuItemBits::NONE, OString(),
nPos++);
+ rMenu.SetHelpId(ID_BROWSER_COLWIDTH, HID_BROWSER_COLUMNWIDTH);
rMenu.InsertSeparator(OString(), nPos++);
}
}
diff --git a/dbaccess/source/ui/browser/sbagrid.src
b/dbaccess/source/ui/browser/sbagrid.src
index 39c4cb2fc4b6..a54584007f4e 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -20,30 +20,14 @@
#include "dbaccess_helpid.hrc"
#include "browserids.hxx"
-Menu RID_SBA_GRID_COLCTXMENU
+String RID_STR_COLUMN_FORMAT
{
- ItemList =
- {
- MenuItem
- {
- Identifier = ID_BROWSER_COLATTRSET ;
- HelpID = HID_BROWSER_COLUMNFORMAT ;
- Text [ en-US ] = "Column ~Format..." ;
- };
- MenuItem
- {
- Identifier = ID_BROWSER_COLWIDTH ;
- HelpID = HID_BROWSER_COLUMNWIDTH ;
- Text [ en-US ] = "Column ~Width..." ;
- HelpID = HID_BROWSER_COLUMNWIDTH;
- };
- MenuItem
- {
- Identifier = ID_BROWSER_COLUMNINFO ;
- HelpID = HID_BROWSER_COLUMNINFO ;
- Text [ en-US ] = "Copy Column D~escription";
- };
- };
+ Text [ en-US ] = "Column ~Format...";
+};
+
+String RID_STR_COLUMN_WIDTH
+{
+ Text [ en-US ] = "Column ~Width...";
};
String RID_STR_TABLE_FORMAT
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index a937ee8a069c..0121edb0a3ef 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -123,7 +123,6 @@
// menus
-#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2
#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5
#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6
#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7
@@ -197,6 +196,8 @@
#define RID_STR_TABLE_FORMAT RID_STR_GEN_START + 65
#define RID_STR_ROW_HEIGHT RID_STR_GEN_START + 66
#define RID_STR_COPY RID_STR_GEN_START + 67
+#define RID_STR_COLUMN_FORMAT RID_STR_GEN_START + 68
+#define RID_STR_COLUMN_WIDTH RID_STR_GEN_START + 69
// untyped resources
commit ff8b873936aa72b17309da4bfc2775573a5b1f55
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 10:25:47 2017 +0100
RID_SBA_GRID_ROWCTXMENU is strangely used to insert entries into another
menu
Change-Id: I61fdb3141c345f1d8dd04ee73d9b1bc332cef754
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index bd8dbae2c479..8d621a054191 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -18,6 +18,7 @@
*/
#include "sbagrid.hrc"
+#include "dbaccess_helpid.hrc"
#include "uiservices.hxx"
#include <sot/exchange.hxx>
@@ -748,24 +749,21 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16
nRow, PopupMenu& rMenu)
{
FmGridControl::PreExecuteRowContextMenu(nRow, rMenu);
- ScopedVclPtrInstance<PopupMenu>
aNewItems(ModuleRes(RID_SBA_GRID_ROWCTXMENU));
sal_uInt16 nPos = 0;
if (!IsReadOnlyDB())
{
- rMenu.InsertItem(ID_BROWSER_TABLEATTR,
aNewItems->GetItemText(ID_BROWSER_TABLEATTR), MenuItemBits::NONE, OString(),
nPos++);
- rMenu.SetHelpId(ID_BROWSER_TABLEATTR,
aNewItems->GetHelpId(ID_BROWSER_TABLEATTR));
+ rMenu.InsertItem(ID_BROWSER_TABLEATTR,
ModuleRes(RID_STR_TABLE_FORMAT).toString(), MenuItemBits::NONE, OString(),
nPos++);
+ rMenu.SetHelpId(ID_BROWSER_TABLEATTR, HID_BROWSER_TABLEFORMAT);
- rMenu.InsertItem(ID_BROWSER_ROWHEIGHT,
aNewItems->GetItemText(ID_BROWSER_ROWHEIGHT), MenuItemBits::NONE, OString(),
nPos++);
- rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT,
aNewItems->GetHelpId(ID_BROWSER_ROWHEIGHT));
+ rMenu.InsertItem(ID_BROWSER_ROWHEIGHT,
ModuleRes(RID_STR_ROW_HEIGHT).toString(), MenuItemBits::NONE, OString(),
nPos++);
+ rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, HID_BROWSER_ROWHEIGHT);
rMenu.InsertSeparator(OString(), nPos++);
}
if ( GetSelectRowCount() > 0 )
{
- rMenu.InsertItem(ID_BROWSER_COPY, aNewItems->GetItemText(SID_COPY),
MenuItemBits::NONE, OString(), nPos++);
- rMenu.SetHelpId(ID_BROWSER_COPY, aNewItems->GetHelpId(SID_COPY));
-
+ rMenu.InsertItem(ID_BROWSER_COPY, ModuleRes(RID_STR_COPY).toString(),
MenuItemBits::NONE, OString(), nPos++);
rMenu.InsertSeparator(OString(), nPos++);
}
}
diff --git a/dbaccess/source/ui/browser/sbagrid.src
b/dbaccess/source/ui/browser/sbagrid.src
index 375e58ba797a..39c4cb2fc4b6 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -46,29 +46,19 @@ Menu RID_SBA_GRID_COLCTXMENU
};
};
-Menu RID_SBA_GRID_ROWCTXMENU
+String RID_STR_TABLE_FORMAT
{
- ItemList =
- {
- MenuItem
- {
- Identifier = ID_BROWSER_TABLEATTR ;
- HelpID = HID_BROWSER_TABLEFORMAT ;
- Text [ en-US ] = "Table Format..." ;
- };
- MenuItem
- {
- Identifier = ID_BROWSER_ROWHEIGHT ;
- HelpID = HID_BROWSER_ROWHEIGHT ;
- Text [ en-US ] = "Row Height..." ;
- };
- MenuItem
- {
- Identifier = SID_COPY ;
- Command = ".uno:Copy" ;
- Text [ en-US ] = "~Copy" ;
- };
- };
+ Text [ en-US ] = "Table Format...";
+};
+
+String RID_STR_ROW_HEIGHT
+{
+ Text [ en-US ] = "Row Height...";
+};
+
+String RID_STR_COPY
+{
+ Text [ en-US ] = "~Copy";
};
String RID_STR_UNDO_MODIFY_RECORD
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 0f539d9e194a..a937ee8a069c 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -62,10 +62,10 @@
#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414
- 433
#define RID_STR_GEN_START RID_STR_UNO_END
-#define RID_STR_GEN_END RID_STR_GEN_START + 65 // 434
- 493
+#define RID_STR_GEN_END RID_STR_GEN_START + 75 // 434
- 503
#define RID_STR_APP_START RID_STR_GEN_END
-#define RID_STR_APP_END RID_STR_APP_START + 40 //
494 - 533
+#define RID_STR_APP_END RID_STR_APP_START + 50 // 504
- 543
#if RID_STR_GEN_END > RID_DBACCESS_END
#error Resource-Id Ueberlauf in #file, #line
@@ -124,7 +124,6 @@
// menus
#define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2
-#define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3
#define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5
#define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6
#define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7
@@ -195,6 +194,9 @@
#define STR_QUERY_CONNECTION_LOST RID_STR_GEN_START + 62
#define STR_QUERY_USERADMIN_DELETE_USER RID_STR_GEN_START + 63
#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES RID_STR_GEN_START + 64
+#define RID_STR_TABLE_FORMAT RID_STR_GEN_START + 65
+#define RID_STR_ROW_HEIGHT RID_STR_GEN_START + 66
+#define RID_STR_COPY RID_STR_GEN_START + 67
// untyped resources
commit e5c6d5ad35faa160bbd3daa593aac0782cd9f1ba
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 7 09:48:00 2017 +0100
extend catch all here for std::exception derived exceptions too
Change-Id: I6b8715b24792f8bbd4434c1bec584b67f8bcc0c5
diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx
index 27abb60d9a60..d15e56aa494a 100644
--- a/vcl/source/gdi/svgdata.cxx
+++ b/vcl/source/gdi/svgdata.cxx
@@ -79,9 +79,13 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx(
}
}
}
- catch(const uno::Exception& e)
+ catch (const uno::Exception& e)
{
- SAL_WARN( "vcl", "Got no graphic::XPrimitive2DRenderer! : " <<
e.Message);
+ SAL_WARN("vcl", "Got no graphic::XPrimitive2DRenderer! : " <<
e.Message);
+ }
+ catch (const std::exception& e)
+ {
+ SAL_WARN("vcl", "Got no graphic::XPrimitive2DRenderer! : " <<
e.what());
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
