diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-03-15 09:49:02 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-03-15 02:50:31 +0100 |
| commit | 043273e721ade64e4fb42f969cf22b4202c6b80d (patch) | |
| tree | 668158b4e7cd04e1264f9121f2cacedfb92d9ebc /xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | |
| parent | 90cb743a69ad4b7cb3466b7ce5b2bbed6353d792 (diff) | |
xmlscript: change import/export to not use GraphicObject URL
Change-Id: Ic81bf1a5ce45394e098366d0f4af53845ba0da87
Reviewed-on: https://gerrit.libreoffice.org/51307
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx')
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 764cdb892d77..9c0e71610112 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -187,8 +187,7 @@ void ElementDescriptor::readButtonModel( StyleBag * all_styles ) readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); readButtonTypeAttr( "PushButtonType", XMLNS_DIALOGS_PREFIX ":button-type" ); - readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" ); - + readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" ); readImageAlignAttr( "ImageAlign", XMLNS_DIALOGS_PREFIX ":image-align" ); @@ -247,7 +246,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" ); readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" ); + readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" ); readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); @@ -417,7 +416,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles ) readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" ); readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); - readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" ); + readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX ":image-position" ); readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" ); readStringAttr( "GroupName", XMLNS_DIALOGS_PREFIX ":group-name" ); @@ -594,7 +593,7 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles ) readBoolAttr( "ScaleImage", XMLNS_DIALOGS_PREFIX ":scale-image" ); readImageScaleModeAttr( "ScaleMode", XMLNS_DIALOGS_PREFIX ":scale-mode" ); readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); - readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":src" ); + readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":src"); readEvents(); } @@ -1042,7 +1041,7 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles ) bool bDecoration = false; if ( (aDecorationAny >>= bDecoration) && !bDecoration ) addAttribute( XMLNS_DIALOGS_PREFIX ":withtitlebar", "false" ); - readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" ); + readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src"); readEvents(); } |