#. extracted from dictionaries/sw_TZ msgid "" msgstr "" "Project-Id-Version: LibO 350-l10n\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2013-05-23 12:05+0200\n" "PO-Revision-Date: 2011-12-18 22:56+0200\n" "Last-Translator: vpanter <leo.moons@telenet.be>\n" "Language-Team: none\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: LibreOffice\n" "X-Accelerator-Marker: ~\n" #: description.xml msgctxt "" "description.xml\n" "dispname\n" "description.text" msgid "Swahili spelling dictionary" msgstr "Swahili spelling woordenboek" ption value='aoo/aw080'>aoo/aw080</option> <option value='aoo/trunk'>aoo/trunk</option> <option value='distro/CN/libreoffice-7-4-LTS'>distro/CN/libreoffice-7-4-LTS</option> <option value='distro/allotropia/zeta-24-2'>distro/allotropia/zeta-24-2</option> <option value='distro/allotropia/zeta-7-3'>distro/allotropia/zeta-7-3</option> <option value='distro/allotropia/zeta-7-4'>distro/allotropia/zeta-7-4</option> <option value='distro/capgemini/cg-4.1'>distro/capgemini/cg-4.1</option> <option value='distro/cib/libreoffice-5-0'>distro/cib/libreoffice-5-0</option> <option value='distro/cib/libreoffice-5-1'>distro/cib/libreoffice-5-1</option> <option value='distro/cib/libreoffice-5-2'>distro/cib/libreoffice-5-2</option> <option value='distro/cib/libreoffice-5-3'>distro/cib/libreoffice-5-3</option> <option value='distro/cib/libreoffice-5-4'>distro/cib/libreoffice-5-4</option> <option value='distro/cib/libreoffice-6-0'>distro/cib/libreoffice-6-0</option> <option value='distro/cib/libreoffice-6-1'>distro/cib/libreoffice-6-1</option> <option value='distro/cib/libreoffice-6-2'>distro/cib/libreoffice-6-2</option> <option value='distro/cib/libreoffice-6-3'>distro/cib/libreoffice-6-3</option> <option value='distro/cib/libreoffice-6-4'>distro/cib/libreoffice-6-4</option> <option value='distro/collabora/cd-5.3'>distro/collabora/cd-5.3</option> <option value='distro/collabora/cd-5.3-3.1'>distro/collabora/cd-5.3-3.1</option> <option value='distro/collabora/cd-5.3-3.2'>distro/collabora/cd-5.3-3.2</option> <option value='distro/collabora/cd-5.3-3.4'>distro/collabora/cd-5.3-3.4</option> <option value='distro/collabora/co-2021'>distro/collabora/co-2021</option> <option value='distro/collabora/co-22.05'>distro/collabora/co-22.05</option> <option value='distro/collabora/co-22.05-testflight'>distro/collabora/co-22.05-testflight</option> <option value='distro/collabora/co-23.05'>distro/collabora/co-23.05</option> <option value='distro/collabora/co-24.04'>distro/collabora/co-24.04</option> <option value='distro/collabora/co-24.04.10'>distro/collabora/co-24.04.10</option> <option value='distro/collabora/co-24.04.11'>distro/collabora/co-24.04.11</option> <option value='distro/collabora/co-24.04.12'>distro/collabora/co-24.04.12</option> <option value='distro/collabora/co-24.04.3'>distro/collabora/co-24.04.3</option> <option value='distro/collabora/co-24.04.4'>distro/collabora/co-24.04.4</option> <option value='distro/collabora/co-24.04.5'>distro/collabora/co-24.04.5</option> <option value='distro/collabora/co-24.04.6'>distro/collabora/co-24.04.6</option> <option value='distro/collabora/co-24.04.7'>distro/collabora/co-24.04.7</option> <option value='distro/collabora/co-24.04.8'>distro/collabora/co-24.04.8</option> <option value='distro/collabora/co-24.04.9'>distro/collabora/co-24.04.9</option> <option value='distro/collabora/co-25.04'>distro/collabora/co-25.04</option> <option value='distro/collabora/cp-4.0'>distro/collabora/cp-4.0</option> <option value='distro/collabora/cp-4.1'>distro/collabora/cp-4.1</option> <option value='distro/collabora/cp-4.2'>distro/collabora/cp-4.2</option> <option value='distro/collabora/cp-4.3'>distro/collabora/cp-4.3</option> <option value='distro/collabora/cp-4.4'>distro/collabora/cp-4.4</option> <option value='distro/collabora/cp-5.0'>distro/collabora/cp-5.0</option> <option value='distro/collabora/cp-5.1'>distro/collabora/cp-5.1</option> <option value='distro/collabora/cp-5.3'>distro/collabora/cp-5.3</option> <option value='distro/collabora/cp-5.3-desktop'>distro/collabora/cp-5.3-desktop</option> <option value='distro/collabora/cp-6.0'>distro/collabora/cp-6.0</option> <option value='distro/collabora/cp-6.0-29'>distro/collabora/cp-6.0-29</option> <option value='distro/collabora/cp-6.2'>distro/collabora/cp-6.2</option> <option value='distro/collabora/cp-6.4'>distro/collabora/cp-6.4</option> <option value='distro/collabora/dcm-6.2'>distro/collabora/dcm-6.2</option> <option value='distro/collabora/dcm-7.5'>distro/collabora/dcm-7.5</option> <option value='distro/collabora/dcm-7.6'>distro/collabora/dcm-7.6</option> <option value='distro/collabora/libreoffice-4.0.6.2'>distro/collabora/libreoffice-4.0.6.2</option> <option value='distro/collabora/libreoffice-7-5+backports'>distro/collabora/libreoffice-7-5+backports</option> <option value='distro/collabora/libreoffice-7-6+backports'>distro/collabora/libreoffice-7-6+backports</option> <option value='distro/collabora/lof-4.3'>distro/collabora/lof-4.3</option> <option value='distro/collabora/lov-4.4'>distro/collabora/lov-4.4</option> <option value='distro/collabora/lov-5.0'>distro/collabora/lov-5.0</option> <option value='distro/collabora/lov-5.1'>distro/collabora/lov-5.1</option> <option value='distro/collabora/lov-5.2'>distro/collabora/lov-5.2</option> <option value='distro/collabora/lov-6.0.4'>distro/collabora/lov-6.0.4</option> <option value='distro/collabora/lov-6.0.5'>distro/collabora/lov-6.0.5</option> <option value='distro/collabora/lov-6.1'>distro/collabora/lov-6.1</option> <option value='distro/collabora/lov-6.4'>distro/collabora/lov-6.4</option> <option value='distro/collabora/viewer'>distro/collabora/viewer</option> <option value='distro/collabora/viewer2'>distro/collabora/viewer2</option> <option value='distro/escriba/escriba-5.2'>distro/escriba/escriba-5.2</option> <option value='distro/escriba/escriba-5.2.1'>distro/escriba/escriba-5.2.1</option> <option value='distro/escriba/escriba-5.4'>distro/escriba/escriba-5.4</option> <option value='distro/lhm/libreoffice-4-1-6+backports'>distro/lhm/libreoffice-4-1-6+backports</option> <option value='distro/lhm/libreoffice-5-2+backports'>distro/lhm/libreoffice-5-2+backports</option> <option value='distro/lhm/libreoffice-6-1+backports'>distro/lhm/libreoffice-6-1+backports</option> <option value='distro/lhm/libreoffice-6-4+backports'>distro/lhm/libreoffice-6-4+backports</option> <option value='distro/lhm/libreoffice-7-0+backports'>distro/lhm/libreoffice-7-0+backports</option> <option value='distro/lhm/libreoffice-7-1+backports'>distro/lhm/libreoffice-7-1+backports</option> <option value='distro/lhm/libreoffice-7-2+backports'>distro/lhm/libreoffice-7-2+backports</option> <option value='distro/lhm/libreoffice-7-3+backports'>distro/lhm/libreoffice-7-3+backports</option> <option value='distro/lhm/libreoffice-7-4+backports'>distro/lhm/libreoffice-7-4+backports</option> <option value='distro/lhm/libreoffice-7-5+backports'>distro/lhm/libreoffice-7-5+backports</option> <option value='distro/lhm/libreoffice-7-6+backports'>distro/lhm/libreoffice-7-6+backports</option> <option value='distro/mimo/mimo-4-1-4-2'>distro/mimo/mimo-4-1-4-2</option> <option value='distro/mimo/mimo-5-4-7-2'>distro/mimo/mimo-5-4-7-2</option> <option value='distro/mimo/mimo-6-0'>distro/mimo/mimo-6-0</option> <option value='distro/mimo/mimo-6-1'>distro/mimo/mimo-6-1</option> <option value='distro/mimo/mimo-6-2'>distro/mimo/mimo-6-2</option> <option value='distro/mimo/mimo-6-3'>distro/mimo/mimo-6-3</option> <option value='distro/mimo/mimo-6-4'>distro/mimo/mimo-6-4</option> <option value='distro/mimo/mimo-7-0'>distro/mimo/mimo-7-0</option> <option value='distro/mimo/mimo-7-1'>distro/mimo/mimo-7-1</option> <option value='distro/mimo/mimo-7-2'>distro/mimo/mimo-7-2</option> <option value='distro/mimo/mimo-7-3'>distro/mimo/mimo-7-3</option> <option value='distro/mimo/mimo-7-4'>distro/mimo/mimo-7-4</option> <option value='distro/mimo/mimo-7-5'>distro/mimo/mimo-7-5</option> <option value='distro/mimo/mimo-7-6'>distro/mimo/mimo-7-6</option> <option value='distro/nisz/libreoffice-6-4'>distro/nisz/libreoffice-6-4</option> <option value='distro/nisz/libreoffice-7-0'>distro/nisz/libreoffice-7-0</option> <option value='distro/nisz/libreoffice-7-1'>distro/nisz/libreoffice-7-1</option> <option value='distro/suse/suse-3.6'>distro/suse/suse-3.6</option> <option value='distro/suse/suse-3.6-appup'>distro/suse/suse-3.6-appup</option> <option value='distro/suse/suse-3.6.3'>distro/suse/suse-3.6.3</option> <option value='distro/suse/suse-4.0'>distro/suse/suse-4.0</option> <option value='distro/suse/suse-4.0.3'>distro/suse/suse-4.0.3</option> <option value='distro/ubuntu/oneiric-3.4'>distro/ubuntu/oneiric-3.4</option> <option value='distro/ubuntu/oneiric-3.4-all'>distro/ubuntu/oneiric-3.4-all</option> <option value='distro/vector/vector-24.2'>distro/vector/vector-24.2</option> <option value='distro/vector/vector-24.2-release'>distro/vector/vector-24.2-release</option> <option value='distro/vector/vector-5.4'>distro/vector/vector-5.4</option> <option value='distro/vector/vector-7.0'>distro/vector/vector-7.0</option> <option value='distro/vector/vector-7.0-10.0'>distro/vector/vector-7.0-10.0</option> <option value='distro/vector/vector-7.5'>distro/vector/vector-7.5</option> <option value='distro/vector/vector-7.5.9'>distro/vector/vector-7.5.9</option> <option value='distro/vector/vector-7.5.9-release'>distro/vector/vector-7.5.9-release</option> <option value='distro/vector/vtext-6.5'>distro/vector/vtext-6.5</option> <option value='feature/5-1-pick'>feature/5-1-pick</option> <option value='feature/BorderlineFix'>feature/BorderlineFix</option> <option value='feature/OperationSmiley'>feature/OperationSmiley</option> <option value='feature/RotGrfFlyFrame'>feature/RotGrfFlyFrame</option> <option value='feature/RotateFlyFrame'>feature/RotateFlyFrame</option> <option value='feature/RotateFlyFrame2'>feature/RotateFlyFrame2</option> <option value='feature/RotateFlyFrame3'>feature/RotateFlyFrame3</option> <option value='feature/SOSAW080'>feature/SOSAW080</option> <option value='feature/SfxShell_refcount'>feature/SfxShell_refcount</option> <option value='feature/SwFrameBorder'>feature/SwFrameBorder</option> <option value='feature/accessibilitycheck'>feature/accessibilitycheck</option> <option value='feature/accfixes2'>feature/accfixes2</option> <option value='feature/allo_contract34185'>feature/allo_contract34185</option> <option value='feature/allo_contract45533'>feature/allo_contract45533</option> <option value='feature/allo_contract45533b'>feature/allo_contract45533b</option> <option value='feature/autostyle'>feature/autostyle</option> <option value='feature/barcode'>feature/barcode</option> <option value='feature/base-preview'>feature/base-preview</option> <option value='feature/benchmarks'>feature/benchmarks</option> <option value='feature/borderline3'>feature/borderline3</option> <option value='feature/bplustree'>feature/bplustree</option> <option value='feature/cairo'>feature/cairo</option> <option value='feature/calc-coordinates'>feature/calc-coordinates</option> <option value='feature/calc-data-table'>feature/calc-data-table</option> <option value='feature/calc-parallel'>feature/calc-parallel</option> <option value='feature/calctiledrendering'>feature/calctiledrendering</option> <option value='feature/calctiledrendering2'>feature/calctiledrendering2</option> <option value='feature/calctiledrendering3'>feature/calctiledrendering3</option> <option value='feature/calctiledrendering4'>feature/calctiledrendering4</option> <option value='feature/calctiledrendering5'>feature/calctiledrendering5</option> <option value='feature/calctiledrendering_alt'>feature/calctiledrendering_alt</option> <option value='feature/calctiledrendering_attempt3'>feature/calctiledrendering_attempt3</option> <option value='feature/calctiledrendering_attempt3_2'>feature/calctiledrendering_attempt3_2</option> <option value='feature/calczoom'>feature/calczoom</option> <option value='feature/chained-text-boxes'>feature/chained-text-boxes</option> <option value='feature/change-tracking'>feature/change-tracking</option> <option value='feature/chart-style-experiment-markus'>feature/chart-style-experiment-markus</option> <option value='feature/chartdatatable'>feature/chartdatatable</option> <option value='feature/cib_contract101'>feature/cib_contract101</option> <option value='feature/cib_contract116'>feature/cib_contract116</option> <option value='feature/cib_contract136'>feature/cib_contract136</option> <option value='feature/cib_contract138'>feature/cib_contract138</option> <option value='feature/cib_contract138b'>feature/cib_contract138b</option> <option value='feature/cib_contract138c'>feature/cib_contract138c</option> <option value='feature/cib_contract138d'>feature/cib_contract138d</option> <option value='feature/cib_contract138e'>feature/cib_contract138e</option> <option value='feature/cib_contract139'>feature/cib_contract139</option> <option value='feature/cib_contract152'>feature/cib_contract152</option> <option value='feature/cib_contract152b'>feature/cib_contract152b</option> <option value='feature/cib_contract3197'>feature/cib_contract3197</option> <option value='feature/cib_contract3753'>feature/cib_contract3753</option> <option value='feature/cib_contract3756'>feature/cib_contract3756</option> <option value='feature/cib_contract3756b'>feature/cib_contract3756b</option> <option value='feature/cib_contract4236'>feature/cib_contract4236</option> <option value='feature/cib_contract4236b'>feature/cib_contract4236b</option> <option value='feature/cib_contract49'>feature/cib_contract49</option> <option value='feature/cib_contract49b'>feature/cib_contract49b</option> <option value='feature/cib_contract49c'>feature/cib_contract49c</option> <option value='feature/cib_contract49d'>feature/cib_contract49d</option> <option value='feature/cib_contract561'>feature/cib_contract561</option> <option value='feature/cib_contract57'>feature/cib_contract57</option> <option value='feature/cib_contract57b'>feature/cib_contract57b</option> <option value='feature/cib_contract57c'>feature/cib_contract57c</option> <option value='feature/cib_contract57d'>feature/cib_contract57d</option> <option value='feature/cib_contract57d+hotfix'>feature/cib_contract57d+hotfix</option> <option value='feature/cib_contract57d_p1'>feature/cib_contract57d_p1</option> <option value='feature/cib_contract57e'>feature/cib_contract57e</option> <option value='feature/cib_contract57l'>feature/cib_contract57l</option> <option value='feature/cib_contract6721b'>feature/cib_contract6721b</option> <option value='feature/cib_contract6721c'>feature/cib_contract6721c</option> <option value='feature/cib_contract7409'>feature/cib_contract7409</option> <option value='feature/cib_contract8161'>feature/cib_contract8161</option> <option value='feature/cib_contract891'>feature/cib_contract891</option> <option value='feature/cib_contract891b'>feature/cib_contract891b</option> <option value='feature/cib_contract891c'>feature/cib_contract891c</option> <option value='feature/cib_contract891d'>feature/cib_contract891d</option> <option value='feature/cib_contract935'>feature/cib_contract935</option> <option value='feature/cib_contract935b'>feature/cib_contract935b</option> <option value='feature/clipboard'>feature/clipboard</option> <option value='feature/cmis'>feature/cmis</option> <option value='feature/components'>feature/components</option> <option value='feature/controlstate'>feature/controlstate</option> <option value='feature/coretext'>feature/coretext</option> <option value='feature/coverrest-featuretests'>feature/coverrest-featuretests</option> <option value='feature/cp-5.0-cairo-svp'>feature/cp-5.0-cairo-svp</option> <option value='feature/cpu_intrinsics_support'>feature/cpu_intrinsics_support</option> <option value='feature/custom-widgets'>feature/custom-widgets</option> <option value='feature/dataprovider'>feature/dataprovider</option> <option value='feature/debugevent'>feature/debugevent</option> <option value='feature/dematurize01'>feature/dematurize01</option> <option value='feature/dialog-screenshots'>feature/dialog-screenshots</option> <option value='feature/docking_windows'>feature/docking_windows</option> <option value='feature/docx-commentsex'>feature/docx-commentsex</option> <option value='feature/drawinglayercore'>feature/drawinglayercore</option> <option value='feature/drawinglayercore2'>feature/drawinglayercore2</option> <option value='feature/droid_calcimpress3'>feature/droid_calcimpress3</option> <option value='feature/droid_calimpress4'>feature/droid_calimpress4</option> <option value='feature/drop-findcmap'>feature/drop-findcmap</option> <option value='feature/editviewoverlay'>feature/editviewoverlay</option> <option value='feature/eszka'>feature/eszka</option> <option value='feature/extended-tooltips'>feature/extended-tooltips</option> <option value='feature/external-data-ui'>feature/external-data-ui</option> <option value='feature/fastparser'>feature/fastparser</option> <option value='feature/firebird-sdbc'>feature/firebird-sdbc</option> <option value='feature/firebird-sdbc2'>feature/firebird-sdbc2</option> <option value='feature/firebird-sdbc3'>feature/firebird-sdbc3</option> <option value='feature/fixstyles3'>feature/fixstyles3</option> <option value='feature/fontsubtitutions'>feature/fontsubtitutions</option> <option value='feature/foo'>feature/foo</option> <option value='feature/gbuild_cli'>feature/gbuild_cli</option> <option value='feature/gccwrapper'>feature/gccwrapper</option> <option value='feature/glyphy'>feature/glyphy</option> <option value='feature/go2'>feature/go2</option> <option value='feature/gpg4libre'>feature/gpg4libre</option> <option value='feature/gpg4libre-5-4'>feature/gpg4libre-5-4</option> <option value='feature/gpg4libre-6-0'>feature/gpg4libre-6-0</option> <option value='feature/gpg4libre2'>feature/gpg4libre2</option> <option value='feature/graphicobject'>feature/graphicobject</option> <option value='feature/gsoc-basic-ide-completion-and-other-bits'>feature/gsoc-basic-ide-completion-and-other-bits</option> <option value='feature/gsoc-calc-enhanced-db-range'>feature/gsoc-calc-enhanced-db-range</option> <option value='feature/gsoc-svm-writer'>feature/gsoc-svm-writer</option> <option value='feature/gsoc-uitest-2019'>feature/gsoc-uitest-2019</option> <option value='feature/gsoc14-colors'>feature/gsoc14-colors</option> <option value='feature/gsoc14-draw-chained-text-boxes'>feature/gsoc14-draw-chained-text-boxes</option> <option value='feature/gsoc14-draw-text-background-color'>feature/gsoc14-draw-text-background-color</option> <option value='feature/gsoc14-libcmis'>feature/gsoc14-libcmis</option> <option value='feature/gsoc14-libcmis2'>feature/gsoc14-libcmis2</option> <option value='feature/gsoc14-personas'>feature/gsoc14-personas</option> <option value='feature/gsoc14-personas2'>feature/gsoc14-personas2</option> <option value='feature/gsoc15-online-update'>feature/gsoc15-online-update</option> <option value='feature/gsoc15-open-remote-files-dialog'>feature/gsoc15-open-remote-files-dialog</option> <option value='feature/gsoc17-revamp-customize-dialog'>feature/gsoc17-revamp-customize-dialog</option> <option value='feature/gsoc19-chart-style'>feature/gsoc19-chart-style</option> <option value='feature/gsoc2011_wizards'>feature/gsoc2011_wizards</option> <option value='feature/gsoc24-lua'>feature/gsoc24-lua</option> <option value='feature/gtk3_kde5'>feature/gtk3_kde5</option> <option value='feature/gtk3nativedialogs'>feature/gtk3nativedialogs</option> <option value='feature/gtktiledviewer'>feature/gtktiledviewer</option> <option value='feature/ia2'>feature/ia2</option> <option value='feature/ia2.2'>feature/ia2.2</option> <option value='feature/ia2.3'>feature/ia2.3</option> <option value='feature/ia2.4'>feature/ia2.4</option> <option value='feature/ia2.5'>feature/ia2.5</option> <option value='feature/improvexlsximport'>feature/improvexlsximport</option> <option value='feature/instdirlinktargets'>feature/instdirlinktargets</option> <option value='feature/item_refactor2'>feature/item_refactor2</option> <option value='feature/jsdialogs'>feature/jsdialogs</option> <option value='feature/jssidebar'>feature/jssidebar</option> <option value='feature/lfrb-vcl-opengl'>feature/lfrb-vcl-opengl</option> <option value='feature/libffi'>feature/libffi</option> <option value='feature/lok-calc-rtl'>feature/lok-calc-rtl</option> <option value='feature/lok-clipboard'>feature/lok-clipboard</option> <option value='feature/lok_cellcursor'>feature/lok_cellcursor</option> <option value='feature/lok_dialog'>feature/lok_dialog</option> <option value='feature/lok_dialog-backport'>feature/lok_dialog-backport</option> <option value='feature/lok_dialog2'>feature/lok_dialog2</option> <option value='feature/lok_sofficemain'>feature/lok_sofficemain</option> <option value='feature/lok_sofficemain2'>feature/lok_sofficemain2</option> <option value='feature/mac-opengl-fixes'>feature/mac-opengl-fixes</option> <option value='feature/macOS-weld'>feature/macOS-weld</option> <option value='feature/mailmerge-toolbar'>feature/mailmerge-toolbar</option> <option value='feature/mar-updater'>feature/mar-updater</option> <option value='feature/mariadb'>feature/mariadb</option> <option value='feature/misc-vba-rework'>feature/misc-vba-rework</option> <option value='feature/mork'>feature/mork</option> <option value='feature/nativealpha'>feature/nativealpha</option> <option value='feature/notebookbar'>feature/notebookbar</option> <option value='feature/notes-refactoring'>feature/notes-refactoring</option> <option value='feature/ooxml-analyze'>feature/ooxml-analyze</option> <option value='feature/opengl-canvas-rework'>feature/opengl-canvas-rework</option> <option value='feature/opengl-transitions-rework'>feature/opengl-transitions-rework</option> <option value='feature/opengl-vcl-text'>feature/opengl-vcl-text</option> <option value='feature/orcus-continuous-integration'>feature/orcus-continuous-integration</option> <option value='feature/orcus-odf'>feature/orcus-odf</option> <option value='feature/orcus-odf-rebased'>feature/orcus-odf-rebased</option> <option value='feature/orcus-odf-rebased2'>feature/orcus-odf-rebased2</option> <option value='feature/orcus-rebased'>feature/orcus-rebased</option> <option value='feature/owncloud-provider-for-android'>feature/owncloud-provider-for-android</option> <option value='feature/pdfium-master'>feature/pdfium-master</option> <option value='feature/perfwork4'>feature/perfwork4</option> <option value='feature/perfwork5'>feature/perfwork5</option> <option value='feature/pivotcharts'>feature/pivotcharts</option> <option value='feature/print_revamp'>feature/print_revamp</option> <option value='feature/priorities'>feature/priorities</option> <option value='feature/profilesafemode'>feature/profilesafemode</option> <option value='feature/propose-master-cib'>feature/propose-master-cib</option> <option value='feature/pytable'>feature/pytable</option> <option value='feature/pyweb-wizard'>feature/pyweb-wizard</option> <option value='feature/qt5-win+mac'>feature/qt5-win+mac</option> <option value='feature/refactor-god-objects'>feature/refactor-god-objects</option> <option value='feature/rendercontext'>feature/rendercontext</option> <option value='feature/resolve-comments'>feature/resolve-comments</option> <option value='feature/scaling-geometry-provider'>feature/scaling-geometry-provider</option> <option value='feature/screenshotannotation'>feature/screenshotannotation</option> <option value='feature/sgexperiment'>feature/sgexperiment</option> <option value='feature/skia'>feature/skia</option> <option value='feature/slidehack'>feature/slidehack</option> <option value='feature/slidehack2'>feature/slidehack2</option> <option value='feature/slideshow_onlySprites'>feature/slideshow_onlySprites</option> <option value='feature/slideshowprimitives'>feature/slideshowprimitives</option> <option value='feature/sparklines'>feature/sparklines</option> <option value='feature/spellig_popup_SID'>feature/spellig_popup_SID</option> <option value='feature/stub_writer'>feature/stub_writer</option> <option value='feature/svg-export'>feature/svg-export</option> <option value='feature/svg-optimisations'>feature/svg-optimisations</option> <option value='feature/svg-optimisations-5-0'>feature/svg-optimisations-5-0</option> <option value='feature/sw-delete-undo-rework'>feature/sw-delete-undo-rework</option> <option value='feature/sw_redlinehide_4a_for_libreoffice-6-2'>feature/sw_redlinehide_4a_for_libreoffice-6-2</option> <option value='feature/sw_redlinehide_4b_for_libreoffice-6-2'>feature/sw_redlinehide_4b_for_libreoffice-6-2</option> <option value='feature/table-style'>feature/table-style</option> <option value='feature/table-style-rebased'>feature/table-style-rebased</option> <option value='feature/table_panel'>feature/table_panel</option> <option value='feature/table_rotated_text'>feature/table_rotated_text</option> <option value='feature/taggedPDF'>feature/taggedPDF</option> <option value='feature/template_manager_improvements'>feature/template_manager_improvements</option> <option value='feature/template_manager_improvements2'>feature/template_manager_improvements2</option> <option value='feature/themesupport'>feature/themesupport</option> <option value='feature/themesupport2'>feature/themesupport2</option> <option value='feature/tiled-editing'>feature/tiled-editing</option> <option value='feature/tscp3'>feature/tscp3</option> <option value='feature/unitver'>feature/unitver</option> <option value='feature/unocrsrptr'>feature/unocrsrptr</option> <option value='feature/unostyles'>feature/unostyles</option> <option value='feature/unostyles2'>feature/unostyles2</option> <option value='feature/unostyles3' selected='selected'>feature/unostyles3</option> <option value='feature/use-ogl-context-in-canvas'>feature/use-ogl-context-in-canvas</option> <option value='feature/vcl-opengl'>feature/vcl-opengl</option> <option value='feature/vcl-opengl-integration'>feature/vcl-opengl-integration</option> <option value='feature/vcl-opengl2'>feature/vcl-opengl2</option> <option value='feature/vclptr'>feature/vclptr</option> <option value='feature/vlc'>feature/vlc</option> <option value='feature/vlc-rb'>feature/vlc-rb</option> <option value='feature/vs2012'>feature/vs2012</option> <option value='feature/wasm'>feature/wasm</option> <option value='feature/window-iter'>feature/window-iter</option> <option value='feature/windows-cross-build'>feature/windows-cross-build</option> <option value='feature/windowsupdater'>feature/windowsupdater</option> <option value='feature/xtiledrenderable'>feature/xtiledrenderable</option> <option value='feature/yrs-demo'>feature/yrs-demo</option> <option value='libreoffice-24-2'>libreoffice-24-2</option> <option value='libreoffice-24-2-0'>libreoffice-24-2-0</option> <option value='libreoffice-24-2-1'>libreoffice-24-2-1</option> <option value='libreoffice-24-2-2'>libreoffice-24-2-2</option> <option value='libreoffice-24-2-3'>libreoffice-24-2-3</option> <option value='libreoffice-24-2-4'>libreoffice-24-2-4</option> <option value='libreoffice-24-2-5'>libreoffice-24-2-5</option> <option value='libreoffice-24-2-6'>libreoffice-24-2-6</option> <option value='libreoffice-24-2-7'>libreoffice-24-2-7</option> <option value='libreoffice-24-8'>libreoffice-24-8</option> <option value='libreoffice-24-8-0'>libreoffice-24-8-0</option> <option value='libreoffice-24-8-1'>libreoffice-24-8-1</option> <option value='libreoffice-24-8-2'>libreoffice-24-8-2</option> <option value='libreoffice-24-8-3'>libreoffice-24-8-3</option> <option value='libreoffice-24-8-4'>libreoffice-24-8-4</option> <option value='libreoffice-24-8-5'>libreoffice-24-8-5</option> <option value='libreoffice-25-2'>libreoffice-25-2</option> <option value='libreoffice-25-2-0'>libreoffice-25-2-0</option> <option value='libreoffice-25-2-1'>libreoffice-25-2-1</option> <option value='libreoffice-3-5'>libreoffice-3-5</option> <option value='libreoffice-3-5-0'>libreoffice-3-5-0</option> <option value='libreoffice-3-5-1'>libreoffice-3-5-1</option> <option value='libreoffice-3-5-2'>libreoffice-3-5-2</option> <option value='libreoffice-3-5-3'>libreoffice-3-5-3</option> <option value='libreoffice-3-5-4'>libreoffice-3-5-4</option> <option value='libreoffice-3-5-5'>libreoffice-3-5-5</option> <option value='libreoffice-3-5-6'>libreoffice-3-5-6</option> <option value='libreoffice-3-5-7'>libreoffice-3-5-7</option> <option value='libreoffice-3-6'>libreoffice-3-6</option> <option value='libreoffice-3-6-0'>libreoffice-3-6-0</option> <option value='libreoffice-3-6-1'>libreoffice-3-6-1</option> <option value='libreoffice-3-6-2'>libreoffice-3-6-2</option> <option value='libreoffice-3-6-3'>libreoffice-3-6-3</option> <option value='libreoffice-3-6-4'>libreoffice-3-6-4</option> <option value='libreoffice-3-6-5'>libreoffice-3-6-5</option> <option value='libreoffice-3-6-6'>libreoffice-3-6-6</option> <option value='libreoffice-3-6-7'>libreoffice-3-6-7</option> <option value='libreoffice-4-0'>libreoffice-4-0</option> <option value='libreoffice-4-0-0'>libreoffice-4-0-0</option> <option value='libreoffice-4-0-1'>libreoffice-4-0-1</option> <option value='libreoffice-4-0-2'>libreoffice-4-0-2</option> <option value='libreoffice-4-0-3'>libreoffice-4-0-3</option> <option value='libreoffice-4-0-4'>libreoffice-4-0-4</option> <option value='libreoffice-4-0-5'>libreoffice-4-0-5</option> <option value='libreoffice-4-0-6'>libreoffice-4-0-6</option> <option value='libreoffice-4-1'>libreoffice-4-1</option> <option value='libreoffice-4-1-0'>libreoffice-4-1-0</option> <option value='libreoffice-4-1-1'>libreoffice-4-1-1</option> <option value='libreoffice-4-1-2'>libreoffice-4-1-2</option> <option value='libreoffice-4-1-3'>libreoffice-4-1-3</option> <option value='libreoffice-4-1-4'>libreoffice-4-1-4</option> <option value='libreoffice-4-1-5'>libreoffice-4-1-5</option> <option value='libreoffice-4-1-6'>libreoffice-4-1-6</option> <option value='libreoffice-4-2'>libreoffice-4-2</option> <option value='libreoffice-4-2-0'>libreoffice-4-2-0</option> <option value='libreoffice-4-2-1'>libreoffice-4-2-1</option> <option value='libreoffice-4-2-2'>libreoffice-4-2-2</option> <option value='libreoffice-4-2-3'>libreoffice-4-2-3</option> <option value='libreoffice-4-2-4'>libreoffice-4-2-4</option> <option value='libreoffice-4-2-5'>libreoffice-4-2-5</option> <option value='libreoffice-4-2-6'>libreoffice-4-2-6</option> <option value='libreoffice-4-2-7'>libreoffice-4-2-7</option> <option value='libreoffice-4-2-8'>libreoffice-4-2-8</option> <option value='libreoffice-4-3'>libreoffice-4-3</option> <option value='libreoffice-4-3-0'>libreoffice-4-3-0</option> <option value='libreoffice-4-3-1'>libreoffice-4-3-1</option> <option value='libreoffice-4-3-2'>libreoffice-4-3-2</option> <option value='libreoffice-4-3-3'>libreoffice-4-3-3</option> <option value='libreoffice-4-3-4'>libreoffice-4-3-4</option> <option value='libreoffice-4-3-5'>libreoffice-4-3-5</option> <option value='libreoffice-4-3-6'>libreoffice-4-3-6</option> <option value='libreoffice-4-3-7'>libreoffice-4-3-7</option> <option value='libreoffice-4-4'>libreoffice-4-4</option> <option value='libreoffice-4-4-0'>libreoffice-4-4-0</option> <option value='libreoffice-4-4-1'>libreoffice-4-4-1</option> <option value='libreoffice-4-4-2'>libreoffice-4-4-2</option> <option value='libreoffice-4-4-3'>libreoffice-4-4-3</option> <option value='libreoffice-4-4-4'>libreoffice-4-4-4</option> <option value='libreoffice-4-4-5'>libreoffice-4-4-5</option> <option value='libreoffice-4-4-6'>libreoffice-4-4-6</option> <option value='libreoffice-4-4-7'>libreoffice-4-4-7</option> <option value='libreoffice-5-0'>libreoffice-5-0</option> <option value='libreoffice-5-0-0'>libreoffice-5-0-0</option> <option value='libreoffice-5-0-1'>libreoffice-5-0-1</option> <option value='libreoffice-5-0-2'>libreoffice-5-0-2</option> <option value='libreoffice-5-0-3'>libreoffice-5-0-3</option> <option value='libreoffice-5-0-4'>libreoffice-5-0-4</option> <option value='libreoffice-5-0-5'>libreoffice-5-0-5</option> <option value='libreoffice-5-0-6'>libreoffice-5-0-6</option> <option value='libreoffice-5-1'>libreoffice-5-1</option> <option value='libreoffice-5-1-0'>libreoffice-5-1-0</option> <option value='libreoffice-5-1-1'>libreoffice-5-1-1</option> <option value='libreoffice-5-1-2'>libreoffice-5-1-2</option> <option value='libreoffice-5-1-3'>libreoffice-5-1-3</option> <option value='libreoffice-5-1-4'>libreoffice-5-1-4</option> <option value='libreoffice-5-1-5'>libreoffice-5-1-5</option> <option value='libreoffice-5-1-6'>libreoffice-5-1-6</option> <option value='libreoffice-5-2'>libreoffice-5-2</option> <option value='libreoffice-5-2-0'>libreoffice-5-2-0</option> <option value='libreoffice-5-2-1'>libreoffice-5-2-1</option> <option value='libreoffice-5-2-2'>libreoffice-5-2-2</option> <option value='libreoffice-5-2-3'>libreoffice-5-2-3</option> <option value='libreoffice-5-2-4'>libreoffice-5-2-4</option> <option value='libreoffice-5-2-5'>libreoffice-5-2-5</option> <option value='libreoffice-5-2-6'>libreoffice-5-2-6</option> <option value='libreoffice-5-2-7'>libreoffice-5-2-7</option> <option value='libreoffice-5-3'>libreoffice-5-3</option> <option value='libreoffice-5-3-0'>libreoffice-5-3-0</option> <option value='libreoffice-5-3-1'>libreoffice-5-3-1</option> <option value='libreoffice-5-3-2'>libreoffice-5-3-2</option> <option value='libreoffice-5-3-3'>libreoffice-5-3-3</option> <option value='libreoffice-5-3-4'>libreoffice-5-3-4</option> <option value='libreoffice-5-3-5'>libreoffice-5-3-5</option> <option value='libreoffice-5-3-6'>libreoffice-5-3-6</option> <option value='libreoffice-5-3-7'>libreoffice-5-3-7</option> <option value='libreoffice-5-4'>libreoffice-5-4</option> <option value='libreoffice-5-4-0'>libreoffice-5-4-0</option> <option value='libreoffice-5-4-1'>libreoffice-5-4-1</option> <option value='libreoffice-5-4-2'>libreoffice-5-4-2</option> <option value='libreoffice-5-4-3'>libreoffice-5-4-3</option> <option value='libreoffice-5-4-4'>libreoffice-5-4-4</option> <option value='libreoffice-5-4-5'>libreoffice-5-4-5</option> <option value='libreoffice-5-4-6'>libreoffice-5-4-6</option> <option value='libreoffice-5-4-7'>libreoffice-5-4-7</option> <option value='libreoffice-6-0'>libreoffice-6-0</option> <option value='libreoffice-6-0-0'>libreoffice-6-0-0</option> <option value='libreoffice-6-0-1'>libreoffice-6-0-1</option> <option value='libreoffice-6-0-2'>libreoffice-6-0-2</option> <option value='libreoffice-6-0-3'>libreoffice-6-0-3</option> <option value='libreoffice-6-0-4'>libreoffice-6-0-4</option> <option value='libreoffice-6-0-5'>libreoffice-6-0-5</option> <option value='libreoffice-6-0-6'>libreoffice-6-0-6</option> <option value='libreoffice-6-0-7'>libreoffice-6-0-7</option> <option value='libreoffice-6-1'>libreoffice-6-1</option> <option value='libreoffice-6-1-0'>libreoffice-6-1-0</option> <option value='libreoffice-6-1-1'>libreoffice-6-1-1</option> <option value='libreoffice-6-1-2'>libreoffice-6-1-2</option> <option value='libreoffice-6-1-3'>libreoffice-6-1-3</option> <option value='libreoffice-6-1-4'>libreoffice-6-1-4</option> <option value='libreoffice-6-1-5'>libreoffice-6-1-5</option> <option value='libreoffice-6-1-6'>libreoffice-6-1-6</option> <option value='libreoffice-6-2'>libreoffice-6-2</option> <option value='libreoffice-6-2-0'>libreoffice-6-2-0</option> <option value='libreoffice-6-2-1'>libreoffice-6-2-1</option> <option value='libreoffice-6-2-2'>libreoffice-6-2-2</option> <option value='libreoffice-6-2-3'>libreoffice-6-2-3</option> <option value='libreoffice-6-2-4'>libreoffice-6-2-4</option> <option value='libreoffice-6-2-5'>libreoffice-6-2-5</option> <option value='libreoffice-6-2-6'>libreoffice-6-2-6</option> <option value='libreoffice-6-2-7'>libreoffice-6-2-7</option> <option value='libreoffice-6-2-8'>libreoffice-6-2-8</option> <option value='libreoffice-6-3'>libreoffice-6-3</option> <option value='libreoffice-6-3-0'>libreoffice-6-3-0</option> <option value='libreoffice-6-3-1'>libreoffice-6-3-1</option> <option value='libreoffice-6-3-2'>libreoffice-6-3-2</option> <option value='libreoffice-6-3-3'>libreoffice-6-3-3</option> <option value='libreoffice-6-3-4'>libreoffice-6-3-4</option> <option value='libreoffice-6-3-5'>libreoffice-6-3-5</option> <option value='libreoffice-6-3-6'>libreoffice-6-3-6</option> <option value='libreoffice-6-4'>libreoffice-6-4</option> <option value='libreoffice-6-4-0'>libreoffice-6-4-0</option> <option value='libreoffice-6-4-1'>libreoffice-6-4-1</option> <option value='libreoffice-6-4-2'>libreoffice-6-4-2</option> <option value='libreoffice-6-4-3'>libreoffice-6-4-3</option> <option value='libreoffice-6-4-4'>libreoffice-6-4-4</option> <option value='libreoffice-6-4-5'>libreoffice-6-4-5</option> <option value='libreoffice-6-4-6'>libreoffice-6-4-6</option> <option value='libreoffice-6-4-7'>libreoffice-6-4-7</option> <option value='libreoffice-7-0'>libreoffice-7-0</option> <option value='libreoffice-7-0-0'>libreoffice-7-0-0</option> <option value='libreoffice-7-0-1'>libreoffice-7-0-1</option> <option value='libreoffice-7-0-2'>libreoffice-7-0-2</option> <option value='libreoffice-7-0-3'>libreoffice-7-0-3</option> <option value='libreoffice-7-0-4'>libreoffice-7-0-4</option> <option value='libreoffice-7-0-5'>libreoffice-7-0-5</option> <option value='libreoffice-7-0-6'>libreoffice-7-0-6</option> <option value='libreoffice-7-1'>libreoffice-7-1</option> <option value='libreoffice-7-1-0'>libreoffice-7-1-0</option> <option value='libreoffice-7-1-1'>libreoffice-7-1-1</option> <option value='libreoffice-7-1-2'>libreoffice-7-1-2</option> <option value='libreoffice-7-1-3'>libreoffice-7-1-3</option> <option value='libreoffice-7-1-4'>libreoffice-7-1-4</option> <option value='libreoffice-7-1-5'>libreoffice-7-1-5</option> <option value='libreoffice-7-1-6'>libreoffice-7-1-6</option> <option value='libreoffice-7-1-7'>libreoffice-7-1-7</option> <option value='libreoffice-7-2'>libreoffice-7-2</option> <option value='libreoffice-7-2-0'>libreoffice-7-2-0</option> <option value='libreoffice-7-2-1'>libreoffice-7-2-1</option> <option value='libreoffice-7-2-2'>libreoffice-7-2-2</option> <option value='libreoffice-7-2-3'>libreoffice-7-2-3</option> <option value='libreoffice-7-2-5'>libreoffice-7-2-5</option> <option value='libreoffice-7-2-6'>libreoffice-7-2-6</option> <option value='libreoffice-7-2-7'>libreoffice-7-2-7</option> <option value='libreoffice-7-3'>libreoffice-7-3</option> <option value='libreoffice-7-3-0'>libreoffice-7-3-0</option> <option value='libreoffice-7-3-1'>libreoffice-7-3-1</option> <option value='libreoffice-7-3-2'>libreoffice-7-3-2</option> <option value='libreoffice-7-3-3'>libreoffice-7-3-3</option> <option value='libreoffice-7-3-4'>libreoffice-7-3-4</option> <option value='libreoffice-7-3-5'>libreoffice-7-3-5</option> <option value='libreoffice-7-3-6'>libreoffice-7-3-6</option> <option value='libreoffice-7-3-7'>libreoffice-7-3-7</option> <option value='libreoffice-7-4'>libreoffice-7-4</option> <option value='libreoffice-7-4-0'>libreoffice-7-4-0</option> <option value='libreoffice-7-4-1'>libreoffice-7-4-1</option> <option value='libreoffice-7-4-2'>libreoffice-7-4-2</option> <option value='libreoffice-7-4-3'>libreoffice-7-4-3</option> <option value='libreoffice-7-4-4'>libreoffice-7-4-4</option> <option value='libreoffice-7-4-6'>libreoffice-7-4-6</option> <option value='libreoffice-7-4-7'>libreoffice-7-4-7</option> <option value='libreoffice-7-5'>libreoffice-7-5</option> <option value='libreoffice-7-5-0'>libreoffice-7-5-0</option> <option value='libreoffice-7-5-1'>libreoffice-7-5-1</option> <option value='libreoffice-7-5-2'>libreoffice-7-5-2</option> <option value='libreoffice-7-5-3'>libreoffice-7-5-3</option> <option value='libreoffice-7-5-4'>libreoffice-7-5-4</option> <option value='libreoffice-7-5-5'>libreoffice-7-5-5</option> <option value='libreoffice-7-5-6'>libreoffice-7-5-6</option> <option value='libreoffice-7-5-7'>libreoffice-7-5-7</option> <option value='libreoffice-7-5-8'>libreoffice-7-5-8</option> <option value='libreoffice-7-5-9'>libreoffice-7-5-9</option> <option value='libreoffice-7-6'>libreoffice-7-6</option> <option value='libreoffice-7-6-0'>libreoffice-7-6-0</option> <option value='libreoffice-7-6-1'>libreoffice-7-6-1</option> <option value='libreoffice-7-6-2'>libreoffice-7-6-2</option> <option value='libreoffice-7-6-3'>libreoffice-7-6-3</option> <option value='libreoffice-7-6-4'>libreoffice-7-6-4</option> <option value='libreoffice-7-6-5'>libreoffice-7-6-5</option> <option value='libreoffice-7-6-6'>libreoffice-7-6-6</option> <option value='libreoffice-7-6-7'>libreoffice-7-6-7</option> <option value='master'>master</option> <option value='ports/macosx10.5/master'>ports/macosx10.5/master</option> <option value='private/Ashod/cd-5.3-3.2_import_unloaded'>private/Ashod/cd-5.3-3.2_import_unloaded</option> <option value='private/Ashod/cd-5.3-3.2_import_unloaded_share_GfxLink'>private/Ashod/cd-5.3-3.2_import_unloaded_share_GfxLink</option> <option value='private/Ashod/cd-5.3.3.2'>private/Ashod/cd-5.3.3.2</option> <option value='private/Ashod/cp-5.0-preinit'>private/Ashod/cp-5.0-preinit</option> <option value='private/Ashod/fast-calc-rendering'>private/Ashod/fast-calc-rendering</option> <option value='private/Ashod/pdfium'>private/Ashod/pdfium</option> <option value='private/Ashod/pdfium_on_master'>private/Ashod/pdfium_on_master</option> <option value='private/Ashod/pdfium_on_master_fixed'>private/Ashod/pdfium_on_master_fixed</option> <option value='private/EL-SHREIF/ui_logger'>private/EL-SHREIF/ui_logger</option> <option value='private/Minion3665/swf-export'>private/Minion3665/swf-export</option> <option value='private/Rosemary/change-tracking'>private/Rosemary/change-tracking</option> <option value='private/Sweetshark/killswclient'>private/Sweetshark/killswclient</option> <option value='private/Sweetshark/lessdepend'>private/Sweetshark/lessdepend</option> <option value='private/Sweetshark/multilistenerfix'>private/Sweetshark/multilistenerfix</option> <option value='private/ajrhunt/c4'>private/ajrhunt/c4</option> <option value='private/ajrhunt/cunit'>private/ajrhunt/cunit</option> <option value='private/ajrhunt/cunitdemo'>private/ajrhunt/cunitdemo</option> <option value='private/ajrhunt/firebird-improvement'>private/ajrhunt/firebird-improvement</option> <option value='private/bansan/chardraw'>private/bansan/chardraw</option> <option value='private/bubli/textboxchaining'>private/bubli/textboxchaining</option> <option value='private/hcvcastro/preinit'>private/hcvcastro/preinit</option> <option value='private/hcvcastro/undo-row-comment'>private/hcvcastro/undo-row-comment</option> <option value='private/jmux/armin-strip-before-squash'>private/jmux/armin-strip-before-squash</option> <option value='private/jmux/broken-static-win'>private/jmux/broken-static-win</option> <option value='private/jmux/current-reorga'>private/jmux/current-reorga</option> <option value='private/jmux/meson'>private/jmux/meson</option> <option value='private/jmux/meson-gsoc-2021'>private/jmux/meson-gsoc-2021</option> <option value='private/jmux/oss-fuzz'>private/jmux/oss-fuzz</option> <option value='private/jmux/oss-fuzz-wip'>private/jmux/oss-fuzz-wip</option> <option value='private/jmux/scheduler-fixes'>private/jmux/scheduler-fixes</option> <option value='private/jmux/shape.odt'>private/jmux/shape.odt</option> <option value='private/jmux/wasm-for-master'>private/jmux/wasm-for-master</option> <option value='private/jmux/wasm-tmp'>private/jmux/wasm-tmp</option> <option value='private/jmux/wasm_for_master_catchall'>private/jmux/wasm_for_master_catchall</option> <option value='private/jmux/win-arm64'>private/jmux/win-arm64</option> <option value='private/jmux/win-test-nohang'>private/jmux/win-test-nohang</option> <option value='private/juergen/Tests'>private/juergen/Tests</option> <option value='private/juergen/check-cjk'>private/juergen/check-cjk</option> <option value='private/kendy/condformat-api'>private/kendy/condformat-api</option> <option value='private/kendy/condformat-fdo82014'>private/kendy/condformat-fdo82014</option> <option value='private/kendy/mailmerge-04'>private/kendy/mailmerge-04</option> <option value='private/kendy/mailmerge-05'>private/kendy/mailmerge-05</option> <option value='private/kendy/swinterpreter'>private/kendy/swinterpreter</option> <option value='private/kendy/testcl'>private/kendy/testcl</option> <option value='private/khaledhosny/color-fonts'>private/khaledhosny/color-fonts</option> <option value='private/khaledhosny/vcl-cleanup-font'>private/khaledhosny/vcl-cleanup-font</option> <option value='private/kohei/chart-bugs'>private/kohei/chart-bugs</option> <option value='private/kohei/find-replace-all-perf'>private/kohei/find-replace-all-perf</option> <option value='private/kohei/headless-perf'>private/kohei/headless-perf</option> <option value='private/kohei/if-or-not-if-jump'>private/kohei/if-or-not-if-jump</option> <option value='private/kohei/sort-ref-update'>private/kohei/sort-ref-update</option> <option value='private/lfrb/opengl-vcl'>private/lfrb/opengl-vcl</option> <option value='private/lgodard/calc_notes_import_export'>private/lgodard/calc_notes_import_export</option> <option value='private/lgodard/tdf#117202'>private/lgodard/tdf#117202</option> <option value='private/llunak/mailmerge'>private/llunak/mailmerge</option> <option value='private/llunak/mailmerge_01'>private/llunak/mailmerge_01</option> <option value='private/llunak/mailmerge_02'>private/llunak/mailmerge_02</option> <option value='private/llunak/mailmerge_03'>private/llunak/mailmerge_03</option> <option value='private/llunak/munich_12587'>private/llunak/munich_12587</option> <option value='private/llunak/skia'>private/llunak/skia</option> <option value='private/lmamane/basetest'>private/lmamane/basetest</option> <option value='private/lmamane/for-julien2412'>private/lmamane/for-julien2412</option> <option value='private/lmamane/for-julien2412-master'>private/lmamane/for-julien2412-master</option> <option value='private/lmamane/tdf110997'>private/lmamane/tdf110997</option> <option value='private/lmamane/timedate-controls-nanosecond'>private/lmamane/timedate-controls-nanosecond</option> <option value='private/lmamane/validation'>private/lmamane/validation</option> <option value='private/mcecchetti/23H1/a11y/paragraph'>private/mcecchetti/23H1/a11y/paragraph</option> <option value='private/mcecchetti/accessibility/paragraph'>private/mcecchetti/accessibility/paragraph</option> <option value='private/mcecchetti/amd/pdf-export-jpeg'>private/mcecchetti/amd/pdf-export-jpeg</option> <option value='private/mcecchetti/bitmapcrc64'>private/mcecchetti/bitmapcrc64</option> <option value='private/mcecchetti/bitmapcrc64-5-0'>private/mcecchetti/bitmapcrc64-5-0</option> <option value='private/mcecchetti/calc-perf-unit-test'>private/mcecchetti/calc-perf-unit-test</option> <option value='private/mcecchetti/calc-unit-test'>private/mcecchetti/calc-unit-test</option> <option value='private/mcecchetti/gl-program-binary'>private/mcecchetti/gl-program-binary</option> <option value='private/mert/wip_deepl'>private/mert/wip_deepl</option> <option value='private/mikekaganski/multicolumn'>private/mikekaganski/multicolumn</option> <option value='private/mmeeks/aafixes44'>private/mmeeks/aafixes44</option> <option value='private/mmeeks/backports'>private/mmeeks/backports</option> <option value='private/mmeeks/binarydatacache'>private/mmeeks/binarydatacache</option> <option value='private/mmeeks/bitmapcrc64'>private/mmeeks/bitmapcrc64</option> <option value='private/mmeeks/copy-paste'>private/mmeeks/copy-paste</option> <option value='private/mmeeks/copypaste'>private/mmeeks/copypaste</option> <option value='private/mmeeks/cp-6.2-bits'>private/mmeeks/cp-6.2-bits</option> <option value='private/mmeeks/cp64merge'>private/mmeeks/cp64merge</option> <option value='private/mmeeks/currency-dropdown'>private/mmeeks/currency-dropdown</option> <option value='private/mmeeks/foo'>private/mmeeks/foo</option> <option value='private/mmeeks/formula-iterator'>private/mmeeks/formula-iterator</option> <option value='private/mmeeks/gldebug'>private/mmeeks/gldebug</option> <option value='private/mmeeks/hidpi-bits'>private/mmeeks/hidpi-bits</option> <option value='private/mmeeks/icontest'>private/mmeeks/icontest</option> <option value='private/mmeeks/opengl-backbuffer'>private/mmeeks/opengl-backbuffer</option> <option value='private/mmeeks/opengl-backbuffer2'>private/mmeeks/opengl-backbuffer2</option> <option value='private/mmeeks/sandbox'>private/mmeeks/sandbox</option> <option value='private/mmeeks/swapdatacontainer'>private/mmeeks/swapdatacontainer</option> <option value='private/mmeeks/vcl-opengl3'>private/mmeeks/vcl-opengl3</option> <option value='private/moggi/fix-opengl-context-problems'>private/moggi/fix-opengl-context-problems</option> <option value='private/moggi/improved-dxf-xls-export'>private/moggi/improved-dxf-xls-export</option> <option value='private/moggi/opengl-4-4-build-test'>private/moggi/opengl-4-4-build-test</option> <option value='private/moggi/opengl-preparation'>private/moggi/opengl-preparation</option> <option value='private/moggi/opengl-vcl-win'>private/moggi/opengl-vcl-win</option> <option value='private/moggi/orcus-improvements'>private/moggi/orcus-improvements</option> <option value='private/moggi/track-win-dc'>private/moggi/track-win-dc</option> <option value='private/moggi/ui-test'>private/moggi/ui-test</option> <option value='private/moggi/vcl-opengl3'>private/moggi/vcl-opengl3</option> <option value='private/mst/sw_fieldmarkhide'>private/mst/sw_fieldmarkhide</option> <option value='private/mst/sw_redlinehide'>private/mst/sw_redlinehide</option> <option value='private/mst/sw_redlinehide_2'>private/mst/sw_redlinehide_2</option> <option value='private/mst/sw_redlinehide_3'>private/mst/sw_redlinehide_3</option> <option value='private/mst/sw_redlinehide_4a'>private/mst/sw_redlinehide_4a</option> <option value='private/mst/sw_redlinehide_4b'>private/mst/sw_redlinehide_4b</option> <option value='private/pranavk/modernize_gtktiledviewer'>private/pranavk/modernize_gtktiledviewer</option> <option value='private/quwex/gsoc-box2d-experimental'>private/quwex/gsoc-box2d-experimental</option> <option value='private/quwex/notespane-search'>private/quwex/notespane-search</option> <option value='private/quwex/notespaneflat'>private/quwex/notespaneflat</option> <option value='private/quwex/notespanesquashed'>private/quwex/notespanesquashed</option> <option value='private/quwex/tdf59323'>private/quwex/tdf59323</option> <option value='private/s.mehrbrodt/colorpicker-backport'>private/s.mehrbrodt/colorpicker-backport</option> <option value='private/sweetshark/swdepend'>private/sweetshark/swdepend</option> <option value='private/tbsdy/clipping'>private/tbsdy/clipping</option> <option value='private/tbsdy/drawserverfontlayout'>private/tbsdy/drawserverfontlayout</option> <option value='private/tbsdy/emf'>private/tbsdy/emf</option> <option value='private/tbsdy/osl_getAllEnvironment'>private/tbsdy/osl_getAllEnvironment</option> <option value='private/tbsdy/outdev'>private/tbsdy/outdev</option> <option value='private/tbsdy/printinfomgr'>private/tbsdy/printinfomgr</option> <option value='private/tbsdy/workbench'>private/tbsdy/workbench</option> <option value='private/thb/libo-6-1+backports'>private/thb/libo-6-1+backports</option> <option value='private/thb/libreoffice-5-2+backports'>private/thb/libreoffice-5-2+backports</option> <option value='private/thb/sw_redlinehide-6-1'>private/thb/sw_redlinehide-6-1</option> <option value='private/thb/tdf149754'>private/thb/tdf149754</option> <option value='private/thb/wasm-upstreaming'>private/thb/wasm-upstreaming</option> <option value='private/timar/cp-6.2-centos7'>private/timar/cp-6.2-centos7</option> <option value='private/timar/fontconfigcrash'>private/timar/fontconfigcrash</option> <option value='private/timar/pythonupgrademsp'>private/timar/pythonupgrademsp</option> <option value='private/tml/Use-the-iOS-French-and-Italian-dictionaries-for-othe'>private/tml/Use-the-iOS-French-and-Italian-dictionaries-for-othe</option> <option value='private/tml/android-use-bionic-linker-copy'>private/tml/android-use-bionic-linker-copy</option> <option value='private/tml/android-use-faulty.lib'>private/tml/android-use-faulty.lib</option> <option value='private/tml/cp-6-4-28-1'>private/tml/cp-6-4-28-1</option> <option value='private/tml/fixwintext'>private/tml/fixwintext</option> <option value='private/tml/iculess'>private/tml/iculess</option> <option value='private/tml/lov-6.1.5.2'>private/tml/lov-6.1.5.2</option> <option value='private/tml/lov-6.2.1'>private/tml/lov-6.2.1</option> <option value='private/tml/lov-7.0.3.3'>private/tml/lov-7.0.3.3</option> <option value='private/tml/lov-7.0.4'>private/tml/lov-7.0.4</option> <option value='private/tml/lov-7.1.2'>private/tml/lov-7.1.2</option> <option value='private/tml/opencl-default-1'>private/tml/opencl-default-1</option> <option value='private/tvajngerl/staging'>private/tvajngerl/staging</option> <option value='ref/for/distro/collabora/cp-6.2'>ref/for/distro/collabora/cp-6.2</option> </select> <input type='submit' value='switch'/></form></td></tr> <tr><td class='sub'>LibreOffice 核心代码仓库</td><td class='sub right'>文档基金会</td></tr></table> <table class='tabs'><tr><td> <a href='/cgit/lo/core/?h=feature/unostyles3'>summary</a><a href='/cgit/lo/core/refs/?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>refs</a><a href='/cgit/lo/core/log/fpicker/source?h=feature/unostyles3'>log</a><a href='/cgit/lo/core/tree/fpicker/source?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>tree</a><a class='active' href='/cgit/lo/core/commit/fpicker/source?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>commit</a><a href='/cgit/lo/core/diff/fpicker/source?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/lo/core/log/fpicker/source'> <input type='hidden' name='h' value='feature/unostyles3'/><input type='hidden' name='id' value='0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='path'>path: <a href='/cgit/lo/core/commit/?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>root</a>/<a href='/cgit/lo/core/commit/fpicker?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker</a>/<a href='/cgit/lo/core/commit/fpicker/source?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>source</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='feature/unostyles3'/><input type='hidden' name='id' value='0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'> <tr><th>author</th><td>Alexander Wilms <f.alexander.wilms@gmail.com></td><td class='right'>2014-02-22 21:20:15 +0100</td></tr> <tr><th>committer</th><td>Caolán McNamara <caolanm@redhat.com></td><td class='right'>2014-02-23 03:38:49 +0000</td></tr> <tr><th>commit</th><td colspan='2' class='sha1'><a href='/cgit/lo/core/commit/fpicker/source?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf</a> (<a href='/cgit/lo/core/patch/fpicker/source?id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>patch</a>)</td></tr> <tr><th>tree</th><td colspan='2' class='sha1'><a href='/cgit/lo/core/tree/?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>5024cba9f9ea5e3b23ea26025323f6aef39488d0</a> /<a href='/cgit/lo/core/tree/fpicker/source?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source</a></td></tr> <tr><th>parent</th><td colspan='2' class='sha1'><a href='/cgit/lo/core/commit/fpicker/source?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>b81ac16e65b311d6e43c05c22c65d2040c9d7e04</a> (<a href='/cgit/lo/core/diff/fpicker/source?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf&id2=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>diff</a>)</td></tr></table> <div class='commit-subject'>Remove unneccessary comments <span class='decoration'></span></div><div class='commit-msg'>Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> </div><div class='diffstat-header'><a href='/cgit/lo/core/diff/?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>Diffstat</a> (limited to 'fpicker/source')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/OfficeControlAccess.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/OfficeControlAccess.cxx</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.0%;'/><td class='rem' style='width: 12.0%;'/><td class='none' style='width: 76.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/OfficeFilePicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/OfficeFilePicker.cxx</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.7%;'/><td class='rem' style='width: 30.7%;'/><td class='none' style='width: 38.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/asyncfilepicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/asyncfilepicker.cxx</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/commonpicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/commonpicker.cxx</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.2%;'/><td class='rem' style='width: 18.2%;'/><td class='none' style='width: 63.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/fpinteraction.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/fpinteraction.cxx</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/fpsmartcontent.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/fpsmartcontent.cxx</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/iodlg.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/iodlg.cxx</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 24.5%;'/><td class='rem' style='width: 24.5%;'/><td class='none' style='width: 51.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/office/iodlgimp.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/iodlgimp.cxx</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/FPentry.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FPentry.cxx</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/FileOpenDlg.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FileOpenDlg.cxx</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 39.6%;'/><td class='rem' style='width: 39.6%;'/><td class='none' style='width: 20.8%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/FilePicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FilePicker.cxx</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 44.8%;'/><td class='rem' style='width: 44.8%;'/><td class='none' style='width: 10.4%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/FilterContainer.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FilterContainer.cxx</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.7%;'/><td class='rem' style='width: 17.7%;'/><td class='none' style='width: 64.6%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/PreviewCtrl.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/PreviewCtrl.cxx</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 22.9%;'/><td class='rem' style='width: 22.9%;'/><td class='none' style='width: 54.2%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/VistaFilePicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/VistaFilePicker.cxx</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 27.6%;'/><td class='rem' style='width: 27.6%;'/><td class='none' style='width: 44.8%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.5%;'/><td class='rem' style='width: 12.5%;'/><td class='none' style='width: 75.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.8%;'/><td class='rem' style='width: 19.8%;'/><td class='none' style='width: 60.4%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/WinFileOpenImpl.cxx</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 50.0%;'/><td class='rem' style='width: 50.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/asynceventnotifier.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/asynceventnotifier.cxx</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 16.7%;'/><td class='none' style='width: 66.7%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/controlaccess.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/controlaccess.cxx</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 11.5%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/controlcommand.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/controlcommand.cxx</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.7%;'/><td class='rem' style='width: 17.7%;'/><td class='none' style='width: 64.6%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/customcontrol.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/customcontrol.cxx</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/customcontrolcontainer.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/customcontrolcontainer.cxx</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 85.4%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/customcontrolfactory.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/customcontrolfactory.cxx</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/dialogcustomcontrols.cxx</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.6%;'/><td class='rem' style='width: 14.6%;'/><td class='none' style='width: 70.8%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/dibpreview.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/dibpreview.cxx</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 16.7%;'/><td class='none' style='width: 66.7%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/filepickereventnotification.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/filepickereventnotification.cxx</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/filepickerstate.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/filepickerstate.cxx</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 31.2%;'/><td class='rem' style='width: 31.2%;'/><td class='none' style='width: 37.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/getfilenamewrapper.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/getfilenamewrapper.cxx</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.4%;'/><td class='rem' style='width: 9.4%;'/><td class='none' style='width: 81.2%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/helppopupwindow.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/helppopupwindow.cxx</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.7%;'/><td class='rem' style='width: 17.7%;'/><td class='none' style='width: 64.6%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/previewadapter.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/previewadapter.cxx</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 37.5%;'/><td class='rem' style='width: 37.5%;'/><td class='none' style='width: 25.0%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/previewbase.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/previewbase.cxx</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 11.5%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/filepicker/workbench/Test_fps.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/workbench/Test_fps.cxx</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/folderpicker/FolderPicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/folderpicker/FolderPicker.cxx</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 13.5%;'/><td class='none' style='width: 72.9%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/folderpicker/MtaFop.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/folderpicker/MtaFop.cxx</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.7%;'/><td class='rem' style='width: 29.7%;'/><td class='none' style='width: 40.6%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/folderpicker/WinFOPImpl.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/folderpicker/WinFOPImpl.cxx</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.3%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/folderpicker/workbench/Test_fops.cxx</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 87.5%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/misc/WinImplHelper.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/misc/WinImplHelper.cxx</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.8%;'/><td class='rem' style='width: 20.8%;'/><td class='none' style='width: 58.3%;'/></tr></table></td></tr> <tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/lo/core/diff/fpicker/source/win32/misc/resourceprovider.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/misc/resourceprovider.cxx</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.5%;'/><td class='rem' style='width: 11.5%;'/><td class='none' style='width: 77.1%;'/></tr></table></td></tr> </table><div class='diffstat-summary'>38 files changed, 1236 insertions, 1236 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx<br/>index 3a5cb879bb67..d7518de9a46b 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/OfficeControlAccess.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/OfficeControlAccess.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/OfficeControlAccess.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/OfficeControlAccess.cxx</a></div><div class='hunk'>@@ -45,10 +45,10 @@ namespace svt</div><div class='ctx'> using namespace CommonFilePickerElementIds;</div><div class='ctx'> using namespace InternalFilePickerElementIds;</div><div class='ctx'> </div><div class='del'>- // --------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> namespace</div><div class='ctx'> {</div><div class='del'>- // ----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> #define PROPERTY_FLAG_TEXT 0x00000001</div><div class='ctx'> #define PROPERTY_FLAG_ENDBALED 0x00000002</div><div class='ctx'> #define PROPERTY_FLAG_VISIBLE 0x00000004</div><div class='hunk'>@@ -58,7 +58,7 @@ namespace svt</div><div class='ctx'> #define PROPERTY_FLAG_SELECTEDITEMINDEX 0x00000040</div><div class='ctx'> #define PROPERTY_FLAG_CHECKED 0x00000080</div><div class='ctx'> </div><div class='del'>- // ----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // ................................................................</div><div class='ctx'> struct ControlDescription</div><div class='ctx'> {</div><div class='hunk'>@@ -121,7 +121,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>- // ----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // ................................................................</div><div class='ctx'> struct ControlProperty</div><div class='ctx'> {</div><div class='hunk'>@@ -161,7 +161,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void lcl_throwIllegalArgumentException( ) SAL_THROW( (IllegalArgumentException) )</div><div class='ctx'> {</div><div class='ctx'> throw IllegalArgumentException();</div><div class='hunk'>@@ -169,7 +169,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OControlAccess::OControlAccess( IFilePickerController* _pController, SvtFileView* _pFileView )</div><div class='ctx'> :m_pFilePickerController( _pController )</div><div class='ctx'> ,m_pFileView( _pFileView )</div><div class='hunk'>@@ -177,7 +177,7 @@ namespace svt</div><div class='ctx'> DBG_ASSERT( m_pFilePickerController, "OControlAccess::OControlAccess: invalid control locator!" );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OControlAccess::setHelpURL( Window* _pControl, const OUString& sHelpURL, sal_Bool _bFileView )</div><div class='ctx'> {</div><div class='ctx'> OUString sHelpID( sHelpURL );</div><div class='hunk'>@@ -194,7 +194,7 @@ namespace svt</div><div class='ctx'> _pControl->SetHelpId( sID );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )</div><div class='ctx'> {</div><div class='ctx'> OString aHelpId = _pControl->GetHelpId();</div><div class='hunk'>@@ -211,7 +211,7 @@ namespace svt</div><div class='ctx'> return sHelpURL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // --------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Any OControlAccess::getControlProperty( const OUString& _rControlName, const OUString& _rControlProperty )</div><div class='ctx'> {</div><div class='ctx'> // look up the control</div><div class='hunk'>@@ -233,7 +233,7 @@ namespace svt</div><div class='ctx'> return implGetControlProperty( pControl, aPropDesc->nPropertyId );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const SAL_THROW( (IllegalArgumentException) )</div><div class='ctx'> {</div><div class='ctx'> Control* pControl = NULL;</div><div class='hunk'>@@ -261,7 +261,7 @@ namespace svt</div><div class='ctx'> return pControl;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OControlAccess::setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue )</div><div class='ctx'> {</div><div class='ctx'> // look up the control</div><div class='hunk'>@@ -278,7 +278,7 @@ namespace svt</div><div class='ctx'> implSetControlProperty( nControlId, pControl, aPropDesc->nPropertyId, _rValue, sal_False );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // --------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Sequence< OUString > OControlAccess::getSupportedControls( )</div><div class='ctx'> {</div><div class='ctx'> Sequence< OUString > aControls( s_nControlCount );</div><div class='hunk'>@@ -295,7 +295,7 @@ namespace svt</div><div class='ctx'> return aControls;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // --------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Sequence< OUString > OControlAccess::getSupportedControlProperties( const OUString& _rControlName )</div><div class='ctx'> {</div><div class='ctx'> sal_Int16 nControlId = -1;</div><div class='hunk'>@@ -315,7 +315,7 @@ namespace svt</div><div class='ctx'> return aProps;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // --------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool OControlAccess::isControlSupported( const OUString& _rControlName )</div><div class='ctx'> {</div><div class='ctx'> ControlDescription tmpDesc;</div><div class='hunk'>@@ -323,7 +323,7 @@ namespace svt</div><div class='ctx'> return ::std::binary_search( s_pControls, s_pControlsEnd, tmpDesc, ControlDescriptionLookup() );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // --------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool OControlAccess::isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty )</div><div class='ctx'> {</div><div class='ctx'> // look up the control</div><div class='hunk'>@@ -341,7 +341,7 @@ namespace svt</div><div class='ctx'> return 0 != ( aPropDesc->nPropertyId & nPropertyMask );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OControlAccess::setValue( sal_Int16 _nControlId, sal_Int16 _nControlAction, const Any& _rValue )</div><div class='ctx'> {</div><div class='ctx'> Control* pControl = m_pFilePickerController->getControl( _nControlId );</div><div class='hunk'>@@ -392,7 +392,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Any OControlAccess::getValue( sal_Int16 _nControlId, sal_Int16 _nControlAction ) const</div><div class='ctx'> {</div><div class='ctx'> Any aRet;</div><div class='hunk'>@@ -460,7 +460,7 @@ namespace svt</div><div class='ctx'> return aRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OControlAccess::setLabel( sal_Int16 nId, const OUString &rLabel )</div><div class='ctx'> {</div><div class='ctx'> Control* pControl = m_pFilePickerController->getControl( nId, sal_True );</div><div class='hunk'>@@ -469,7 +469,7 @@ namespace svt</div><div class='ctx'> pControl->SetText( rLabel );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString OControlAccess::getLabel( sal_Int16 nId ) const</div><div class='ctx'> {</div><div class='ctx'> OUString sLabel;</div><div class='hunk'>@@ -482,13 +482,13 @@ namespace svt</div><div class='ctx'> return sLabel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OControlAccess::enableControl( sal_Int16 _nId, sal_Bool _bEnable )</div><div class='ctx'> {</div><div class='ctx'> m_pFilePickerController->enableControl( _nId, _bEnable );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OControlAccess::implDoListboxAction( ListBox* _pListbox, sal_Int16 _nControlAction, const Any& _rValue )</div><div class='ctx'> {</div><div class='ctx'> switch ( _nControlAction )</div><div class='hunk'>@@ -532,7 +532,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OControlAccess::implSetControlProperty( sal_Int16 _nControlId, Control* _pControl, sal_Int16 _nProperty, const Any& _rValue, sal_Bool _bIgnoreIllegalArgument )</div><div class='ctx'> {</div><div class='ctx'> if ( !_pControl )</div><div class='hunk'>@@ -688,7 +688,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Any OControlAccess::implGetControlProperty( Control* _pControl, sal_Int16 _nProperty ) const</div><div class='ctx'> {</div><div class='ctx'> DBG_ASSERT( _pControl, "OControlAccess::implGetControlProperty: invalid argument, this will crash!" );</div><div class='head'>diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx<br/>index 524330925954..5c6bbfabfc31 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/OfficeFilePicker.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/OfficeFilePicker.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/OfficeFilePicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/OfficeFilePicker.cxx</a></div><div class='hunk'>@@ -93,20 +93,20 @@ public:</div><div class='ctx'> </div><div class='ctx'> //=====================================================================</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )</div><div class='ctx'> :m_sTitle( _rTitle )</div><div class='ctx'> ,m_aSubFilters( _rSubFilters )</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool FilterEntry::hasSubFilters( ) const</div><div class='ctx'> {</div><div class='ctx'> return ( 0 < m_aSubFilters.getLength() );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )</div><div class='ctx'> {</div><div class='ctx'> _rSubFilterList = m_aSubFilters;</div><div class='hunk'>@@ -144,7 +144,7 @@ ElementEntry_Impl::ElementEntry_Impl( sal_Int16 nId )</div><div class='ctx'> , m_bHasEnabled( sal_False )</div><div class='ctx'> {}</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFilePicker::prepareExecute()</div><div class='ctx'> {</div><div class='ctx'> // set the default directory</div><div class='hunk'>@@ -222,7 +222,7 @@ void SvtFilePicker::prepareExecute()</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog*, pDlg )</div><div class='ctx'> {</div><div class='ctx'> if ( m_xDlgClosedListener.is() )</div><div class='hunk'>@@ -235,11 +235,11 @@ IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog*, pDlg )</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // SvtFilePicker</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> WinBits SvtFilePicker::getWinBits( WinBits& rExtraBits )</div><div class='ctx'> {</div><div class='ctx'> // set the winbits for creating the filedialog</div><div class='hunk'>@@ -307,7 +307,7 @@ WinBits SvtFilePicker::getWinBits( WinBits& rExtraBits )</div><div class='ctx'> return nBits;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId )</div><div class='ctx'> {</div><div class='ctx'> if ( !m_xListener.is() )</div><div class='hunk'>@@ -338,7 +338,7 @@ void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId )</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> namespace {</div><div class='ctx'> //................................................................................</div><div class='ctx'> struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool ></div><div class='hunk'>@@ -374,7 +374,7 @@ namespace {</div><div class='ctx'> };</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SvtFilePicker::FilterNameExists( const OUString& rTitle )</div><div class='ctx'> {</div><div class='ctx'> sal_Bool bRet = sal_False;</div><div class='hunk'>@@ -390,7 +390,7 @@ sal_Bool SvtFilePicker::FilterNameExists( const OUString& rTitle )</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SvtFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters )</div><div class='ctx'> {</div><div class='ctx'> sal_Bool bRet = sal_False;</div><div class='hunk'>@@ -409,7 +409,7 @@ sal_Bool SvtFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )</div><div class='ctx'> {</div><div class='ctx'> if ( !m_pFilterList )</div><div class='hunk'>@@ -422,9 +422,9 @@ void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // class SvtFilePicker</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SvtFilePicker::SvtFilePicker( const Reference < XMultiServiceFactory >& xFactory )</div><div class='ctx'> :OCommonPicker( xFactory )</div><div class='ctx'> ,m_pFilterList ( NULL )</div><div class='hunk'>@@ -445,7 +445,7 @@ SvtFilePicker::~SvtFilePicker()</div><div class='ctx'> delete m_pElemList;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int16 SvtFilePicker::implExecutePicker( )</div><div class='ctx'> {</div><div class='ctx'> getDialog()->SetFileCallback( this );</div><div class='hunk'>@@ -463,7 +463,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( )</div><div class='ctx'> return nRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent )</div><div class='ctx'> {</div><div class='ctx'> WinBits nExtraBits;</div><div class='hunk'>@@ -482,43 +482,43 @@ SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent )</div><div class='ctx'> return dialog;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // disambiguate XInterface</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPLEMENT_FORWARD_XINTERFACE2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base )</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // disambiguate XTypeProvider</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base )</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XExecutableDialog functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> OCommonPicker::setTitle( _rTitle );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int16 SAL_CALL SvtFilePicker::execute( ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> return OCommonPicker::execute();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XAsynchronousExecutableDialog functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> setTitle( _rTitle );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener )</div><div class='ctx'> throw (RuntimeException,</div><div class='ctx'> std::exception)</div><div class='hunk'>@@ -530,9 +530,9 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::sta</div><div class='ctx'> getDialog()->StartExecuteModal( LINK( this, SvtFilePicker, DialogClosedHdl ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilePicker functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -625,9 +625,9 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException</div><div class='ctx'> return aPath;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilePickerControlAccess functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,</div><div class='ctx'> sal_Int16 nControlAction,</div><div class='hunk'>@@ -673,7 +673,7 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction )</div><div class='ctx'> throw( RuntimeException )</div><div class='hunk'>@@ -710,7 +710,7 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue )</div><div class='ctx'> throw ( RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -750,7 +750,7 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValu</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )</div><div class='ctx'> throw ( RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -783,7 +783,7 @@ OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )</div><div class='ctx'> return aLabel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnable )</div><div class='ctx'> throw( RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -823,9 +823,9 @@ void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnab</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilePickerNotifier functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener ) throw ( RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -835,7 +835,7 @@ void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePicker</div><div class='ctx'> m_xListener = xListener;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) throw ( RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -844,9 +844,9 @@ void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePic</div><div class='ctx'> m_xListener.clear();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilePreview functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()</div><div class='ctx'> throw ( RuntimeException )</div><div class='hunk'>@@ -861,7 +861,7 @@ Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()</div><div class='ctx'> return aFormats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -875,7 +875,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException</div><div class='ctx'> return nDepth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -889,7 +889,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException )</div><div class='ctx'> return nWidth;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -903,7 +903,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException</div><div class='ctx'> return nHeight;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage )</div><div class='ctx'> throw ( IllegalArgumentException, RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -914,7 +914,7 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage</div><div class='ctx'> getDialog()->setImage( aImageFormat, rImage );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )</div><div class='ctx'> throw ( RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -929,7 +929,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -943,9 +943,9 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException )</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilterGroupManager functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,</div><div class='ctx'> const Sequence< StringPair >& aFilters )</div><div class='hunk'>@@ -971,9 +971,9 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,</div><div class='ctx'> m_pFilterList->insert( m_pFilterList->end(), FilterEntry( sGroupTitle, aFilters ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilterManager functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,</div><div class='ctx'> const OUString& aFilter )</div><div class='hunk'>@@ -994,7 +994,7 @@ void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,</div><div class='ctx'> m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )</div><div class='ctx'> throw( IllegalArgumentException, RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -1010,7 +1010,7 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )</div><div class='ctx'> getDialog()->SetCurFilter( aTitle );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString SAL_CALL SvtFilePicker::getCurrentFilter()</div><div class='ctx'> throw( RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -1023,9 +1023,9 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter()</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XInitialization functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )</div><div class='ctx'> throw ( Exception, RuntimeException )</div><div class='hunk'>@@ -1081,7 +1081,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )</div><div class='ctx'> OCommonPicker::initialize( aArguments );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )</div><div class='ctx'> {</div><div class='ctx'> if ( _rName == "TemplateDescription" )</div><div class='hunk'>@@ -1107,9 +1107,9 @@ sal_Bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName</div><div class='ctx'> return OCommonPicker::implHandleInitializationArgument( _rName, _rValue );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XServiceInfo</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> /* XServiceInfo */</div><div class='ctx'> OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException )</div><div class='head'>diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx<br/>index 012bad46a8b3..d2763257d25b 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/asyncfilepicker.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/asyncfilepicker.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/asyncfilepicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/asyncfilepicker.cxx</a></div><div class='hunk'>@@ -34,7 +34,7 @@ namespace svt</div><div class='ctx'> //= AsyncPickerAction</div><div class='ctx'> //====================================================================</div><div class='ctx'> DBG_NAME( AsyncPickerAction )</div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> AsyncPickerAction::AsyncPickerAction( SvtFileDialog* _pDialog, SvtFileView* _pView, const Action _eAction )</div><div class='ctx'> :m_refCount ( 0 )</div><div class='ctx'> ,m_eAction ( _eAction )</div><div class='hunk'>@@ -47,19 +47,19 @@ namespace svt</div><div class='ctx'> DBG_ASSERT( m_pView, "AsyncPickerAction::AsyncPickerAction: invalid view!" );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> AsyncPickerAction::~AsyncPickerAction()</div><div class='ctx'> {</div><div class='ctx'> DBG_DTOR( AsyncPickerAction, NULL );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> oslInterlockedCount SAL_CALL AsyncPickerAction::acquire()</div><div class='ctx'> {</div><div class='ctx'> return osl_atomic_increment( &m_refCount );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> oslInterlockedCount SAL_CALL AsyncPickerAction::release()</div><div class='ctx'> {</div><div class='ctx'> if ( 0 == osl_atomic_decrement( &m_refCount ) )</div><div class='hunk'>@@ -70,7 +70,7 @@ namespace svt</div><div class='ctx'> return m_refCount;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void AsyncPickerAction::cancel()</div><div class='ctx'> {</div><div class='ctx'> DBG_TESTSOLARMUTEX();</div><div class='hunk'>@@ -81,7 +81,7 @@ namespace svt</div><div class='ctx'> m_pView->CancelRunningAsyncAction();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void AsyncPickerAction::execute(</div><div class='ctx'> const OUString& _rURL,</div><div class='ctx'> const OUString& _rFilter,</div><div class='hunk'>@@ -151,7 +151,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPL_LINK( AsyncPickerAction, OnActionDone, void*, pEmptyArg )</div><div class='ctx'> {</div><div class='ctx'> DBG_TESTSOLARMUTEX();</div><div class='head'>diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx<br/>index 5f2d8424516d..3602918efc28 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/commonpicker.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/commonpicker.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/commonpicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/commonpicker.cxx</a></div><div class='hunk'>@@ -45,7 +45,7 @@ namespace svt</div><div class='ctx'> using namespace ::com::sun::star::beans;</div><div class='ctx'> using namespace ::comphelper;</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OCommonPicker::OCommonPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory )</div><div class='ctx'> :OCommonPicker_Base( m_aMutex )</div><div class='ctx'> ,OPropertyContainer( GetBroadcastHelper() )</div><div class='hunk'>@@ -68,7 +68,7 @@ namespace svt</div><div class='ctx'> );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OCommonPicker::~OCommonPicker()</div><div class='ctx'> {</div><div class='ctx'> if ( !GetBroadcastHelper().bDisposed )</div><div class='hunk'>@@ -78,19 +78,19 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // disambiguate XInterface</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPLEMENT_FORWARD_XINTERFACE2( OCommonPicker, OCommonPicker_Base, OPropertyContainer )</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // disambiguate XTypeProvider</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCommonPicker, OCommonPicker_Base, OPropertyContainer )</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XComponent related methods</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OCommonPicker::checkAlive() const SAL_THROW( (DisposedException) )</div><div class='ctx'> {</div><div class='ctx'> if ( GetBroadcastHelper().bInDispose || GetBroadcastHelper().bDisposed )</div><div class='hunk'>@@ -107,7 +107,7 @@ namespace svt</div><div class='ctx'> getDialog()->SetText( m_aTitle );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OCommonPicker::disposing()</div><div class='ctx'> {</div><div class='ctx'> SolarMutexGuard aGuard;</div><div class='hunk'>@@ -129,16 +129,16 @@ namespace svt</div><div class='ctx'> m_xDialogParent = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OCommonPicker::stopWindowListening()</div><div class='ctx'> {</div><div class='ctx'> disposeComponent( m_xWindowListenerAdapter );</div><div class='ctx'> disposeComponent( m_xParentListenerAdapter );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XEventListener</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> SolarMutexGuard aGuard;</div><div class='hunk'>@@ -162,9 +162,9 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // property set related methods</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> ::cppu::IPropertyArrayHelper* OCommonPicker::createArrayHelper( ) const</div><div class='ctx'> {</div><div class='ctx'> Sequence< Property > aProps;</div><div class='hunk'>@@ -172,19 +172,19 @@ namespace svt</div><div class='ctx'> return new cppu::OPropertyArrayHelper( aProps );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> ::cppu::IPropertyArrayHelper& SAL_CALL OCommonPicker::getInfoHelper()</div><div class='ctx'> {</div><div class='ctx'> return *const_cast< OCommonPicker* >( this )->getArrayHelper();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo( ) throw(RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception)</div><div class='ctx'> {</div><div class='ctx'> OPropertyContainer::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );</div><div class='hunk'>@@ -196,7 +196,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool OCommonPicker::createPicker()</div><div class='ctx'> {</div><div class='ctx'> SolarMutexGuard aGuard;</div><div class='hunk'>@@ -245,9 +245,9 @@ namespace svt</div><div class='ctx'> return NULL != m_pDlg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XControlAccess functions</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -260,7 +260,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -275,9 +275,9 @@ namespace svt</div><div class='ctx'> return Any();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XControlInformation functions</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls( ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -292,7 +292,7 @@ namespace svt</div><div class='ctx'> return Sequence< OUString >();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -307,7 +307,7 @@ namespace svt</div><div class='ctx'> return sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -322,7 +322,7 @@ namespace svt</div><div class='ctx'> return Sequence< OUString >();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> checkAlive();</div><div class='hunk'>@@ -337,16 +337,16 @@ namespace svt</div><div class='ctx'> return sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XExecutableDialog functions</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> SolarMutexGuard aGuard;</div><div class='ctx'> m_aTitle = _rTitle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int16 OCommonPicker::execute() throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> SolarMutexGuard aGuard;</div><div class='hunk'>@@ -366,9 +366,9 @@ namespace svt</div><div class='ctx'> return nResult;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XCancellable functions</div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OCommonPicker::cancel( ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> {</div><div class='hunk'>@@ -391,7 +391,7 @@ namespace svt</div><div class='ctx'> m_nCancelEvent = Application::PostUserEvent( LINK( this, OCommonPicker, OnCancelPicker ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker)</div><div class='ctx'> {</div><div class='ctx'> // By definition, the solar mutex is locked when we arrive here. Note that this</div><div class='hunk'>@@ -412,9 +412,9 @@ namespace svt</div><div class='ctx'> return 0L;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XInitialization functions</div><div class='del'>- //------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OCommonPicker::initialize( const Sequence< Any >& _rArguments )</div><div class='ctx'> throw ( Exception, RuntimeException )</div><div class='ctx'> {</div><div class='hunk'>@@ -475,7 +475,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool OCommonPicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )</div><div class='ctx'> {</div><div class='ctx'> sal_Bool bKnown = sal_True;</div><div class='head'>diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx<br/>index 78a441b65d23..6072f11fbe37 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/fpinteraction.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/fpinteraction.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/fpinteraction.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/fpinteraction.cxx</a></div><div class='hunk'>@@ -37,7 +37,7 @@ namespace svt</div><div class='ctx'> //= OFilePickerInteractionHandler</div><div class='ctx'> //====================================================================</div><div class='ctx'> DBG_NAME( OFilePickerInteractionHandler )</div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OFilePickerInteractionHandler::OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster )</div><div class='ctx'> :m_xMaster( _rxMaster )</div><div class='ctx'> ,m_bUsed( sal_False )</div><div class='hunk'>@@ -47,13 +47,13 @@ namespace svt</div><div class='ctx'> DBG_ASSERT( m_xMaster.is(), "OFilePickerInteractionHandler::OFilePickerInteractionHandler: invalid master handler!" );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OFilePickerInteractionHandler::~OFilePickerInteractionHandler( )</div><div class='ctx'> {</div><div class='ctx'> DBG_DTOR( OFilePickerInteractionHandler, NULL );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> if (!_rxRequest.is())</div><div class='hunk'>@@ -115,31 +115,31 @@ namespace svt</div><div class='ctx'> m_xMaster->handle(_rxRequest);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OFilePickerInteractionHandler::enableInterceptions( EInterceptedInteractions eInterceptions )</div><div class='ctx'> {</div><div class='ctx'> m_eInterceptions = eInterceptions;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool OFilePickerInteractionHandler::wasUsed() const</div><div class='ctx'> {</div><div class='ctx'> return m_bUsed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OFilePickerInteractionHandler::resetUseState()</div><div class='ctx'> {</div><div class='ctx'> m_bUsed = sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void OFilePickerInteractionHandler::forgetRequest()</div><div class='ctx'> {</div><div class='ctx'> m_aException = Any();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool OFilePickerInteractionHandler::wasAccessDenied() const</div><div class='ctx'> {</div><div class='ctx'> InteractiveIOException aIoException;</div><div class='head'>diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx<br/>index afd374ba5ca0..e12a4a91ed47 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/fpsmartcontent.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/fpsmartcontent.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/fpsmartcontent.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/fpsmartcontent.cxx</a></div><div class='hunk'>@@ -44,7 +44,7 @@ namespace svt</div><div class='ctx'> //====================================================================</div><div class='ctx'> //= SmartContent</div><div class='ctx'> //====================================================================</div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SmartContent::SmartContent()</div><div class='ctx'> :m_pContent( NULL )</div><div class='ctx'> ,m_eState( NOT_BOUND )</div><div class='hunk'>@@ -52,7 +52,7 @@ namespace svt</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SmartContent::SmartContent( const OUString& _rInitialURL )</div><div class='ctx'> :m_pContent( NULL )</div><div class='ctx'> ,m_eState( NOT_BOUND )</div><div class='hunk'>@@ -61,7 +61,7 @@ namespace svt</div><div class='ctx'> bindTo( _rInitialURL );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SmartContent::~SmartContent()</div><div class='ctx'> {</div><div class='ctx'> /* This destructor originally contained the following blurb: "Do</div><div class='hunk'>@@ -78,7 +78,7 @@ namespace svt</div><div class='ctx'> delete m_pContent;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SmartContent::enableOwnInteractionHandler(::svt::OFilePickerInteractionHandler::EInterceptedInteractions eInterceptions)</div><div class='ctx'> {</div><div class='ctx'> Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();</div><div class='hunk'>@@ -92,7 +92,7 @@ namespace svt</div><div class='ctx'> m_xCmdEnv = new ::ucbhelper::CommandEnvironment( m_xOwnInteraction, Reference< XProgressHandler >() );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SmartContent::enableDefaultInteractionHandler()</div><div class='ctx'> {</div><div class='ctx'> // Don't free the memory here! It will be done by the next</div><div class='hunk'>@@ -106,7 +106,7 @@ namespace svt</div><div class='ctx'> m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> ::svt::OFilePickerInteractionHandler* SmartContent::getOwnInteractionHandler() const</div><div class='ctx'> {</div><div class='ctx'> if (!m_xOwnInteraction.is())</div><div class='hunk'>@@ -114,7 +114,7 @@ namespace svt</div><div class='ctx'> return m_pOwnInteraction;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SmartContent::InteractionHandlerType SmartContent::queryCurrentInteractionHandler() const</div><div class='ctx'> {</div><div class='ctx'> if (m_xOwnInteraction.is())</div><div class='hunk'>@@ -126,7 +126,7 @@ namespace svt</div><div class='ctx'> return IHT_DEFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SmartContent::disableInteractionHandler()</div><div class='ctx'> {</div><div class='ctx'> // Don't free the memory here! It will be done by the next</div><div class='hunk'>@@ -137,7 +137,7 @@ namespace svt</div><div class='ctx'> m_xCmdEnv.clear();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SmartContent::bindTo( const OUString& _rURL )</div><div class='ctx'> {</div><div class='ctx'> if ( getURL() == _rURL )</div><div class='hunk'>@@ -182,7 +182,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SmartContent::implIs( const OUString& _rURL, Type _eType )</div><div class='ctx'> {</div><div class='ctx'> // bind to this content</div><div class='hunk'>@@ -215,7 +215,7 @@ namespace svt</div><div class='ctx'> return bIs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SmartContent::getTitle( OUString& /* [out] */ _rTitle )</div><div class='ctx'> {</div><div class='ctx'> if ( !isBound() || isInvalid() )</div><div class='hunk'>@@ -237,7 +237,7 @@ namespace svt</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SmartContent::hasParentFolder( )</div><div class='ctx'> {</div><div class='ctx'> if ( !isBound() || isInvalid() )</div><div class='hunk'>@@ -268,7 +268,7 @@ namespace svt</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //--------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SmartContent::canCreateFolder( )</div><div class='ctx'> {</div><div class='ctx'> if ( !isBound() || isInvalid() )</div><div class='head'>diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx<br/>index f50209a6c9f6..2a643856db66 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/iodlg.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/iodlg.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/iodlg.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/iodlg.cxx</a></div><div class='hunk'>@@ -124,7 +124,7 @@ using namespace InternalFilePickerElementIds;</div><div class='ctx'> namespace</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString getMostCurrentFilter( SvtExpFileDlg_Impl* pImpl )</div><div class='ctx'> {</div><div class='ctx'> DBG_ASSERT( pImpl, "invalid impl pointer" );</div><div class='hunk'>@@ -139,7 +139,7 @@ namespace</div><div class='ctx'> return pFilter->GetType();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool restoreCurrentFilter( SvtExpFileDlg_Impl* _pImpl )</div><div class='ctx'> {</div><div class='ctx'> DBG_ASSERT( _pImpl->GetCurFilter(), "restoreCurrentFilter: no current filter!" );</div><div class='hunk'>@@ -156,7 +156,7 @@ namespace</div><div class='ctx'> return _pImpl->m_bNeedDelayedFilterExecute;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString GetFsysExtension_Impl( const OUString& rFile, const OUString& rLastFilterExt )</div><div class='ctx'> {</div><div class='ctx'> sal_Int32 nDotPos = rFile.lastIndexOf( '.' );</div><div class='hunk'>@@ -173,7 +173,7 @@ namespace</div><div class='ctx'> return OUString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SetFsysExtension_Impl( OUString& rFile, const OUString& rExtension )</div><div class='ctx'> {</div><div class='ctx'> const sal_Unicode* p0 = rFile.getStr();</div><div class='hunk'>@@ -189,7 +189,7 @@ namespace</div><div class='ctx'> rFile += rExtension;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // move the control with the given offset</div><div class='ctx'> void lcl_MoveControl( Control* _pControl, sal_Int32 _nDeltaX, sal_Int32 _nDeltaY, sal_Int32* _pMaxY = NULL )</div><div class='ctx'> {</div><div class='hunk'>@@ -209,7 +209,7 @@ namespace</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void lcl_autoUpdateFileExtension( SvtFileDialog* _pDialog, const OUString& _rLastFilterExt )</div><div class='ctx'> {</div><div class='ctx'> // if auto extension is enabled ....</div><div class='hunk'>@@ -264,7 +264,7 @@ namespace</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool lcl_getHomeDirectory( const OUString& _rForURL, OUString& /* [out] */ _rHomeDir )</div><div class='ctx'> {</div><div class='ctx'> _rHomeDir = "";</div><div class='hunk'>@@ -300,7 +300,7 @@ namespace</div><div class='ctx'> return !_rHomeDir.isEmpty();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> static OUString lcl_ensureFinalSlash( const OUString& _rDir )</div><div class='ctx'> {</div><div class='ctx'> INetURLObject aWorkPathObj( _rDir, INET_PROT_FILE );</div><div class='hunk'>@@ -308,7 +308,7 @@ namespace</div><div class='ctx'> return aWorkPathObj.GetMainURL( INetURLObject::NO_DECODE );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> /** retrieves the value of an environment variable</div><div class='ctx'> @return <TRUE/> if and only if the retrieved string value is not empty</div><div class='ctx'> */</div><div class='hunk'>@@ -802,7 +802,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SvtFileDialog, ViewHdl_Impl, ImageButton*, EMPTYARG</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter, sal_Bool _bAllowUserDefExt )</div><div class='ctx'> {</div><div class='ctx'> // delete the old user filter and create a new one</div><div class='hunk'>@@ -845,13 +845,13 @@ sal_Bool SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter, sal_Bo</div><div class='ctx'> return bIsAllFiles;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> #define FLT_NONEMPTY 0x0001</div><div class='ctx'> #define FLT_CHANGED 0x0002</div><div class='ctx'> #define FLT_USERFILTER 0x0004</div><div class='ctx'> #define FLT_ALLFILESFILTER 0x0008</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter )</div><div class='ctx'> {</div><div class='ctx'> sal_uInt16 nReturn = 0;</div><div class='hunk'>@@ -916,7 +916,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter )</div><div class='ctx'> return nReturn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl)</div><div class='ctx'> {</div><div class='ctx'> if ( m_pCurrentAsyncAction.is() )</div><div class='hunk'>@@ -931,7 +931,7 @@ IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl)</div><div class='ctx'> return 1L;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )</div><div class='ctx'> {</div><div class='ctx'> if ( pThis->_pImp->_bMultiSelection && pThis->_pFileView->GetSelectionCount() > 1 )</div><div class='hunk'>@@ -1766,7 +1766,7 @@ public:</div><div class='ctx'> </div><div class='ctx'> //*****************************************************************************</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::updateListboxLabelSizes()</div><div class='ctx'> {</div><div class='ctx'> sal_Int16 nLineControlId[5] = {</div><div class='hunk'>@@ -1816,7 +1816,7 @@ bool implIsInvalid( const OUString & rURL )</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString SvtFileDialog::implGetInitialURL( const OUString& _rPath, const OUString& _rFallback )</div><div class='ctx'> {</div><div class='ctx'> // an URL parser for the fallback</div><div class='hunk'>@@ -1868,7 +1868,7 @@ OUString SvtFileDialog::implGetInitialURL( const OUString& _rPath, const OUStrin</div><div class='ctx'> return aURLParser.GetMainURL( INetURLObject::NO_DECODE );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> short SvtFileDialog::Execute()</div><div class='ctx'> {</div><div class='ctx'> if ( !PrepareExecute() )</div><div class='hunk'>@@ -1900,7 +1900,7 @@ short SvtFileDialog::Execute()</div><div class='ctx'> return nResult;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )</div><div class='ctx'> {</div><div class='ctx'> PrepareExecute();</div><div class='hunk'>@@ -1909,7 +1909,7 @@ void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )</div><div class='ctx'> ModalDialog::StartExecuteModal( rEndDialogHdl );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::onAsyncOperationStarted()</div><div class='ctx'> {</div><div class='ctx'> EnableUI( sal_False );</div><div class='hunk'>@@ -1918,7 +1918,7 @@ void SvtFileDialog::onAsyncOperationStarted()</div><div class='ctx'> _pImp->_pBtnCancel->GrabFocus();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::onAsyncOperationFinished()</div><div class='ctx'> {</div><div class='ctx'> EnableUI( sal_True );</div><div class='hunk'>@@ -1929,13 +1929,13 @@ void SvtFileDialog::onAsyncOperationFinished()</div><div class='ctx'> // and to the user, the operation appears to be synchronous)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::RemovablePlaceSelected(bool enable)</div><div class='ctx'> {</div><div class='ctx'> _pImp->_pPlaces->SetDelEnabled( enable );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCode )</div><div class='ctx'> {</div><div class='ctx'> try</div><div class='hunk'>@@ -1973,7 +1973,7 @@ void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCod</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::EnableUI( sal_Bool _bEnable )</div><div class='ctx'> {</div><div class='ctx'> Enable( _bEnable );</div><div class='hunk'>@@ -1990,7 +1990,7 @@ void SvtFileDialog::EnableUI( sal_Bool _bEnable )</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )</div><div class='ctx'> {</div><div class='ctx'> if ( !_pControl )</div><div class='hunk'>@@ -2011,7 +2011,7 @@ void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )</div><div class='ctx'> m_aDisabledControls.insert( _pControl );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> short SvtFileDialog::PrepareExecute()</div><div class='ctx'> {</div><div class='hunk'>@@ -2196,7 +2196,7 @@ short SvtFileDialog::PrepareExecute()</div><div class='ctx'> return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action _eAction,</div><div class='ctx'> const OUString& _rURL, const OUString& _rFilter )</div><div class='ctx'> {</div><div class='hunk'>@@ -2325,7 +2325,7 @@ void SvtFileDialog::AddFilterGroup( const OUString& _rFilter, const Sequence< St</div><div class='ctx'> implAddFilter( pSubFilters->First, pSubFilters->Second );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::SetCurFilter( const OUString& rFilter )</div><div class='ctx'> {</div><div class='ctx'> DBG_ASSERT( !IsInExecute(), "SvtFileDialog::SetCurFilter: currently executing!" );</div><div class='hunk'>@@ -2554,7 +2554,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r</div><div class='ctx'> return sal_True;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::implUpdateImages( )</div><div class='ctx'> {</div><div class='ctx'> m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) );</div><div class='hunk'>@@ -2567,7 +2567,7 @@ void SvtFileDialog::implUpdateImages( )</div><div class='ctx'> _pImp->_pBtnNewFolder->SetModeImage( GetButtonImage( IMG_FILEDLG_CREATEFOLDER ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::DataChanged( const DataChangedEvent& _rDCEvt )</div><div class='ctx'> {</div><div class='ctx'> if ( DATACHANGED_SETTINGS == _rDCEvt.GetType() )</div><div class='hunk'>@@ -2576,7 +2576,7 @@ void SvtFileDialog::DataChanged( const DataChangedEvent& _rDCEvt )</div><div class='ctx'> ModalDialog::DataChanged( _rDCEvt );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::Resize()</div><div class='ctx'> {</div><div class='ctx'> if ( IsRollUp() )</div><div class='hunk'>@@ -2629,7 +2629,7 @@ void SvtFileDialog::Resize()</div><div class='ctx'> // This resize was only called to show or hide the indicator.</div><div class='ctx'> return;</div><div class='ctx'> </div><div class='del'>- // -------------</div><div class='add'>+</div><div class='ctx'> // move controls</div><div class='ctx'> </div><div class='ctx'> // controls to move vertically</div><div class='hunk'>@@ -2672,7 +2672,7 @@ void SvtFileDialog::Resize()</div><div class='ctx'> lcl_MoveControl( *ppMoveControls, nDeltaX, 0 );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- // ---------------</div><div class='add'>+</div><div class='ctx'> // resize controls</div><div class='ctx'> {</div><div class='ctx'> Control* aSizeControls[] =</div><div class='hunk'>@@ -2717,7 +2717,7 @@ void SvtFileDialog::Resize()</div><div class='ctx'> _pFileNotifier->notify( DIALOG_SIZE_CHANGED, 0 );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> Control* SvtFileDialog::getControl( sal_Int16 _nControlId, sal_Bool _bLabelControl ) const</div><div class='ctx'> {</div><div class='ctx'> Control* pReturn = NULL;</div><div class='hunk'>@@ -2842,7 +2842,7 @@ Control* SvtFileDialog::getControl( sal_Int16 _nControlId, sal_Bool _bLabelContr</div><div class='ctx'> return pReturn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::enableControl( sal_Int16 _nControlId, sal_Bool _bEnable )</div><div class='ctx'> {</div><div class='ctx'> Control* pControl = getControl( _nControlId, sal_False );</div><div class='hunk'>@@ -2853,7 +2853,7 @@ void SvtFileDialog::enableControl( sal_Int16 _nControlId, sal_Bool _bEnable )</div><div class='ctx'> EnableControl( pLabel, _bEnable );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::AddControls_Impl( )</div><div class='ctx'> {</div><div class='ctx'> // create the "insert as link" checkbox, if needed</div><div class='hunk'>@@ -2968,7 +2968,7 @@ void SvtFileDialog::AddControls_Impl( )</div><div class='ctx'> initDefaultPlaces();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int32 SvtFileDialog::getTargetColorDepth()</div><div class='ctx'> {</div><div class='ctx'> if ( _pPrevBmp )</div><div class='hunk'>@@ -2977,7 +2977,7 @@ sal_Int32 SvtFileDialog::getTargetColorDepth()</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int32 SvtFileDialog::getAvailableWidth()</div><div class='ctx'> {</div><div class='ctx'> if ( _pPrevBmp )</div><div class='hunk'>@@ -2986,7 +2986,7 @@ sal_Int32 SvtFileDialog::getAvailableWidth()</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Int32 SvtFileDialog::getAvailableHeight()</div><div class='ctx'> {</div><div class='ctx'> if ( _pPrevBmp )</div><div class='hunk'>@@ -2995,7 +2995,7 @@ sal_Int32 SvtFileDialog::getAvailableHeight()</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::setImage( sal_Int16 /*aImageFormat*/, const Any& rImage )</div><div class='ctx'> {</div><div class='ctx'> if ( ! _pPrevBmp || ! _pPrevBmp->IsVisible() )</div><div class='hunk'>@@ -3020,7 +3020,7 @@ void SvtFileDialog::setImage( sal_Int16 /*aImageFormat*/, const Any& rImage )</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SvtFileDialog::setShowState( sal_Bool /*bShowState*/ )</div><div class='ctx'> {</div><div class='ctx'> // #97633 for the system filedialog it's</div><div class='hunk'>@@ -3038,7 +3038,7 @@ sal_Bool SvtFileDialog::setShowState( sal_Bool /*bShowState*/ )</div><div class='ctx'> return sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString SvtFileDialog::getCurrentFileText( ) const</div><div class='ctx'> {</div><div class='ctx'> OUString sReturn;</div><div class='hunk'>@@ -3047,7 +3047,7 @@ OUString SvtFileDialog::getCurrentFileText( ) const</div><div class='ctx'> return sReturn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::setCurrentFileText( const OUString& _rText, bool _bSelectAll )</div><div class='ctx'> {</div><div class='ctx'> if ( _pImp && _pImp->_pEdFileName )</div><div class='hunk'>@@ -3058,13 +3058,13 @@ void SvtFileDialog::setCurrentFileText( const OUString& _rText, bool _bSelectAll</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SvtFileDialog::isAutoExtensionEnabled()</div><div class='ctx'> {</div><div class='ctx'> return _pImp->_pCbAutoExtension && _pImp->_pCbAutoExtension->IsChecked();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> sal_Bool SvtFileDialog::getShowState()</div><div class='ctx'> {</div><div class='ctx'> if ( _pPrevBmp )</div><div class='hunk'>@@ -3073,7 +3073,7 @@ sal_Bool SvtFileDialog::getShowState()</div><div class='ctx'> return sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialog::ReleaseOwnership( Window* pUserControl )</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -3351,7 +3351,7 @@ QueryFolderNameDialog::QueryFolderNameDialog(Window* _pParent,</div><div class='ctx'> m_pNameLine->set_label( *pGroupName );</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl)</div><div class='ctx'> {</div><div class='ctx'> // trim the strings</div><div class='hunk'>@@ -3360,7 +3360,7 @@ IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl)</div><div class='ctx'> return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -----------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl)</div><div class='ctx'> {</div><div class='ctx'> // trim the strings</div><div class='head'>diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx<br/>index d1a9b00b8f99..e8630a196aa4 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/office/iodlgimp.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/office/iodlgimp.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/office/iodlgimp.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/office/iodlgimp.cxx</a></div><div class='hunk'>@@ -98,7 +98,7 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl()</div><div class='ctx'> //= SvtFileDialogURLSelector</div><div class='ctx'> //=============================================================================</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SvtFileDialogURLSelector::SvtFileDialogURLSelector( SvtFileDialog* _pParent, const ResId& _rResId, sal_uInt16 _nButtonId )</div><div class='ctx'> :MenuButton ( _pParent, _rResId )</div><div class='ctx'> ,m_pParent ( _pParent )</div><div class='hunk'>@@ -110,13 +110,13 @@ SvtFileDialogURLSelector::SvtFileDialogURLSelector( SvtFileDialog* _pParent, con</div><div class='ctx'> SetDropDown( PUSHBUTTON_DROPDOWN_TOOLBOX );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SvtFileDialogURLSelector::~SvtFileDialogURLSelector()</div><div class='ctx'> {</div><div class='ctx'> delete m_pMenu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtFileDialogURLSelector::Activate()</div><div class='ctx'> {</div><div class='ctx'> m_pMenu->Clear();</div><div class='hunk'>@@ -130,18 +130,18 @@ void SvtFileDialogURLSelector::Activate()</div><div class='ctx'> //= SvtUpButton_Impl</div><div class='ctx'> //=============================================================================</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SvtUpButton_Impl::SvtUpButton_Impl( SvtFileDialog* pParent, const ResId& rResId )</div><div class='ctx'> :SvtFileDialogURLSelector( pParent, rResId, IMG_FILEDLG_BTN_UP )</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> SvtUpButton_Impl::~SvtUpButton_Impl()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )</div><div class='ctx'> {</div><div class='ctx'> SvtFileView* pBox = GetDialogParent()->GetView();</div><div class='hunk'>@@ -184,7 +184,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtUpButton_Impl::Select()</div><div class='ctx'> {</div><div class='ctx'> sal_uInt16 nId = GetCurItemId();</div><div class='hunk'>@@ -198,7 +198,7 @@ void SvtUpButton_Impl::Select()</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtUpButton_Impl::Click()</div><div class='ctx'> {</div><div class='ctx'> GetDialogParent()->PrevLevel_Impl();</div><div class='hunk'>@@ -287,7 +287,7 @@ void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir )</div><div class='ctx'> </div><div class='ctx'> //*****************************************************************************</div><div class='ctx'> #if defined DBG_UTIL</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> namespace {</div><div class='ctx'> OUString lcl_DecoratedFilter( const OUString& _rOriginalFilter )</div><div class='ctx'> {</div><div class='hunk'>@@ -299,14 +299,14 @@ namespace {</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SvtExpFileDlg_Impl::ClearFilterList( )</div><div class='ctx'> {</div><div class='ctx'> _pLbFilter->Clear();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtExpFileDlg_Impl::SetCurFilter( SvtFileDialogFilter_Impl* pFilter, const OUString& rDisplayName )</div><div class='ctx'> {</div><div class='ctx'> DBG_ASSERT( pFilter, "SvtExpFileDlg_Impl::SetCurFilter: invalid filter!" );</div><div class='hunk'>@@ -318,7 +318,7 @@ void SvtExpFileDlg_Impl::SetCurFilter( SvtFileDialogFilter_Impl* pFilter, const</div><div class='ctx'> m_sCurrentFilterDisplayName = rDisplayName;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl* _pFilterDesc )</div><div class='ctx'> {</div><div class='ctx'> OUString sName = _pFilterDesc->GetName();</div><div class='hunk'>@@ -332,7 +332,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*</div><div class='ctx'> _pLbFilter->SetEntryData( nPos, const_cast< void* >( static_cast< const void* >( _pFilterDesc ) ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SvtExpFileDlg_Impl::InitFilterList( )</div><div class='ctx'> {</div><div class='hunk'>@@ -351,7 +351,7 @@ void SvtExpFileDlg_Impl::InitFilterList( )</div><div class='ctx'> InsertFilterListEntry( &(*_pFilter)[ nPos-- ] );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SvtExpFileDlg_Impl::CreateFilterListControl( Window* _pParent, const ResId& _rId )</div><div class='ctx'> {</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx<br/>index f314a5f19b22..d0ae05d4ae64 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FPentry.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/FPentry.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FPentry.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FPentry.cxx</a></div><div class='hunk'>@@ -34,9 +34,9 @@</div><div class='ctx'> #include "../folderpicker/FOPServiceInfo.hxx"</div><div class='ctx'> #include "../folderpicker/WinFOPImpl.hxx"</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------</div><div class='add'>+</div><div class='ctx'> // namespace directives</div><div class='del'>-//-----------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> using namespace ::rtl ;</div><div class='ctx'> using namespace ::com::sun::star::uno ;</div><div class='hunk'>@@ -47,9 +47,9 @@ using namespace ::cppu ;</div><div class='ctx'> using ::com::sun::star::ui::dialogs::XFilePicker;</div><div class='ctx'> using ::com::sun::star::ui::dialogs::XFilePicker2;</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static Reference< XInterface > SAL_CALL createInstance(</div><div class='ctx'> const Reference< XMultiServiceFactory >& rServiceManager )</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx<br/>index a9eee26a1f77..0898bfe608bb 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FileOpenDlg.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/FileOpenDlg.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FileOpenDlg.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FileOpenDlg.cxx</a></div><div class='hunk'>@@ -22,9 +22,9 @@</div><div class='ctx'> #include "../misc/WinImplHelper.hxx"</div><div class='ctx'> #include "FileOpenDlg.hxx"</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // constants</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> namespace /* private */</div><div class='ctx'> {</div><div class='hunk'>@@ -44,9 +44,9 @@ namespace /* private */</div><div class='ctx'> </div><div class='ctx'> const LPCTSTR CURRENT_INSTANCE = TEXT("CurrInst");</div><div class='ctx'> </div><div class='del'>- //------------------------------------------</div><div class='add'>+</div><div class='ctx'> // find an appropriate parent window</div><div class='del'>- //------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline bool is_current_process_window(HWND hwnd)</div><div class='ctx'> {</div><div class='hunk'>@@ -65,9 +65,9 @@ namespace /* private */</div><div class='ctx'> }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFileOpenDialog::CFileOpenDialog(</div><div class='ctx'> bool bFileOpenDialog,</div><div class='hunk'>@@ -126,17 +126,17 @@ CFileOpenDialog::CFileOpenDialog(</div><div class='ctx'> m_ofn.lCustData = reinterpret_cast<sal_IntPtr>(this);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFileOpenDialog::~CFileOpenDialog()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle)</div><div class='ctx'> {</div><div class='hunk'>@@ -144,9 +144,9 @@ void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle)</div><div class='ctx'> m_ofn.lpstrTitle = reinterpret_cast<LPCTSTR>(m_dialogTitle.getStr());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CFileOpenDialog::setFilter(const OUString& aFilter)</div><div class='ctx'> {</div><div class='hunk'>@@ -159,9 +159,9 @@ void CFileOpenDialog::setFilter(const OUString& aFilter)</div><div class='ctx'> m_ofn.lpstrFilter = reinterpret_cast<LPCTSTR>(m_filterBuffer.getStr());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex)</div><div class='ctx'> {</div><div class='hunk'>@@ -170,18 +170,18 @@ bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex)</div><div class='ctx'> return sal_True;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const</div><div class='ctx'> {</div><div class='ctx'> return m_ofn.nFilterIndex;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,9 +190,9 @@ void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName)</div><div class='ctx'> m_ofn.lpstrFile = reinterpret_cast<LPTSTR>(const_cast<sal_Unicode*>(m_fileNameBuffer.getStr()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory)</div><div class='ctx'> {</div><div class='hunk'>@@ -200,18 +200,18 @@ void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory)</div><div class='ctx'> m_ofn.lpstrInitialDir = reinterpret_cast<LPCTSTR>(m_displayDirectory.getStr());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const</div><div class='ctx'> {</div><div class='ctx'> return m_displayDirectory;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFileOpenDialog::getFullFileName() const</div><div class='ctx'> {</div><div class='hunk'>@@ -219,18 +219,18 @@ OUString SAL_CALL CFileOpenDialog::getFullFileName() const</div><div class='ctx'> _wcslenex(m_fileNameBuffer.getStr()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFileOpenDialog::getFileName() const</div><div class='ctx'> {</div><div class='ctx'> return OUString(m_fileTitleBuffer.getStr());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString CFileOpenDialog::getFileExtension()</div><div class='ctx'> {</div><div class='hunk'>@@ -241,9 +241,9 @@ OUString CFileOpenDialog::getFileExtension()</div><div class='ctx'> return OUString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension)</div><div class='ctx'> {</div><div class='hunk'>@@ -251,9 +251,9 @@ void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension)</div><div class='ctx'> m_ofn.lpstrDefExt = reinterpret_cast<LPCTSTR>(m_defaultExtension.getStr());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode)</div><div class='ctx'> {</div><div class='hunk'>@@ -263,18 +263,18 @@ void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode)</div><div class='ctx'> m_ofn.Flags &= ~OFN_ALLOWMULTISELECT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> bool SAL_CALL CFileOpenDialog::getMultiSelectionMode() const</div><div class='ctx'> {</div><div class='ctx'> return ((m_ofn.Flags & OFN_ALLOWMULTISELECT) > 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int16 SAL_CALL CFileOpenDialog::doModal()</div><div class='ctx'> {</div><div class='hunk'>@@ -304,27 +304,27 @@ sal_Int16 SAL_CALL CFileOpenDialog::doModal()</div><div class='ctx'> return nRC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 SAL_CALL CFileOpenDialog::getLastDialogError() const</div><div class='ctx'> {</div><div class='ctx'> return CommDlgExtendedError();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> bool SAL_CALL CFileOpenDialog::preModal()</div><div class='ctx'> {</div><div class='ctx'> return sal_True;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)</div><div class='ctx'> {</div><div class='hunk'>@@ -339,9 +339,9 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const</div><div class='ctx'> {</div><div class='hunk'>@@ -361,9 +361,9 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const</div><div class='ctx'> return OUString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const</div><div class='ctx'> {</div><div class='hunk'>@@ -383,9 +383,9 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const</div><div class='ctx'> return OUString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const</div><div class='ctx'> {</div><div class='hunk'>@@ -405,77 +405,77 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const</div><div class='ctx'> return OUString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&)</div><div class='ctx'> {</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 SAL_CALL CFileOpenDialog::onFileOk()</div><div class='ctx'> {</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::onSelChanged(HWND)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::onHelp()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::onInitDone()</div><div class='ctx'> {</div><div class='ctx'> centerPositionToParent();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::onFolderChanged()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::onTypeChanged(sal_uInt32)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16)</div><div class='ctx'> {</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify )</div><div class='ctx'> {</div><div class='hunk'>@@ -512,9 +512,9 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify )</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild)</div><div class='ctx'> {</div><div class='hunk'>@@ -528,9 +528,9 @@ void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild)</div><div class='ctx'> onInitDialog(hwndDlg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc(</div><div class='ctx'> HWND hChildDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)</div><div class='hunk'>@@ -579,9 +579,9 @@ UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc(</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> LRESULT CALLBACK CFileOpenDialog::BaseDlgProc(</div><div class='ctx'> HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam)</div><div class='hunk'>@@ -608,9 +608,9 @@ LRESULT CALLBACK CFileOpenDialog::BaseDlgProc(</div><div class='ctx'> hWnd,wMessage,wParam,lParam);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd)</div><div class='ctx'> {</div><div class='hunk'>@@ -619,9 +619,9 @@ CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd)</div><div class='ctx'> GetProp(hwnd, CURRENT_INSTANCE));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFileOpenDialog::centerPositionToParent() const</div><div class='ctx'> {</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx<br/>index b78bacbb774f..105bb81d73e1 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FilePicker.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/FilePicker.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FilePicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FilePicker.cxx</a></div><div class='hunk'>@@ -33,9 +33,9 @@</div><div class='ctx'> </div><div class='ctx'> #include <comphelper/sequenceasvector.hxx></div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // namespace directives</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> using namespace com::sun::star;</div><div class='ctx'> </div><div class='hunk'>@@ -44,9 +44,9 @@ using namespace ::com::sun::star::ui::dialogs::TemplateDescription;</div><div class='ctx'> </div><div class='ctx'> #define FILE_PICKER_DLL_NAME TEXT("fps.dll")</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // helper functions</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> namespace</div><div class='ctx'> {</div><div class='hunk'>@@ -63,9 +63,9 @@ namespace</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) :</div><div class='ctx'> CFilePicker_Base(m_rbHelperMtx),</div><div class='hunk'>@@ -85,9 +85,9 @@ CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xSer</div><div class='ctx'> hInstance ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFPEventListenerManager</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePickerListener>& xListener)</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -101,9 +101,9 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke</div><div class='ctx'> rBHelper.aLC.addInterface( getCppuType( &xListener ), xListener );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePickerListener>& xListener )</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -116,9 +116,9 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi</div><div class='ctx'> rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XEventListener</div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -128,9 +128,9 @@ void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno:</div><div class='ctx'> removeFilePickerListener(xFilePickerListener);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent)</div><div class='ctx'> {</div><div class='hunk'>@@ -139,9 +139,9 @@ void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent)</div><div class='ctx'> new CFilePickerParamEventNotification(&XFilePickerListener::fileSelectionChanged,aEvent));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent)</div><div class='ctx'> {</div><div class='hunk'>@@ -150,9 +150,9 @@ void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent)</div><div class='ctx'> new CFilePickerParamEventNotification(&XFilePickerListener::directoryChanged,aEvent));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent)</div><div class='ctx'> {</div><div class='hunk'>@@ -161,9 +161,9 @@ void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent)</div><div class='ctx'> new CFilePickerParamEventNotification(&XFilePickerListener::controlStateChanged,aEvent));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::dialogSizeChanged()</div><div class='ctx'> {</div><div class='hunk'>@@ -171,9 +171,9 @@ void SAL_CALL CFilePicker::dialogSizeChanged()</div><div class='ctx'> new CFilePickerEventNotification(&XFilePickerListener::dialogSizeChanged));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // If there are more then one listener the return value of the last one wins</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const</div><div class='ctx'> {</div><div class='hunk'>@@ -217,45 +217,45 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const</div><div class='ctx'> return aHelpText;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> bool CFilePicker::startupEventNotification(bool bStartupSuspended)</div><div class='ctx'> {</div><div class='ctx'> return m_aAsyncEventNotifier.startup(bStartupSuspended);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CFilePicker::shutdownEventNotification()</div><div class='ctx'> {</div><div class='ctx'> m_aAsyncEventNotifier.shutdown();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CFilePicker::suspendEventNotification()</div><div class='ctx'> {</div><div class='ctx'> m_aAsyncEventNotifier.suspend();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CFilePicker::resumeEventNotification()</div><div class='ctx'> {</div><div class='ctx'> m_aAsyncEventNotifier.resume();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilePicker functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -264,9 +264,9 @@ void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::Runt</div><div class='ctx'> m_pImpl->setMultiSelectionMode(bMode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -275,9 +275,9 @@ void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeEx</div><div class='ctx'> m_pImpl->setTitle(aTitle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter)</div><div class='ctx'> throw(lang::IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -287,9 +287,9 @@ void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString&</div><div class='ctx'> m_pImpl->appendFilter(aTitle, aFilter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)</div><div class='ctx'> throw(lang::IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -299,9 +299,9 @@ void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)</div><div class='ctx'> m_pImpl->setCurrentFilter(aTitle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -310,9 +310,9 @@ OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)</div><div class='ctx'> return m_pImpl->getCurrentFilter();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)</div><div class='ctx'> throw (lang::IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -322,9 +322,9 @@ void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const</div><div class='ctx'> m_pImpl->appendFilterGroup(sGroupTitle, aFilters);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -334,9 +334,9 @@ void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)</div><div class='ctx'> m_pImpl->setDefaultName(aName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)</div><div class='ctx'> throw(lang::IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -346,9 +346,9 @@ void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)</div><div class='ctx'> m_pImpl->setDisplayDirectory(aDirectory);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -357,9 +357,9 @@ OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException</div><div class='ctx'> return m_pImpl->getDisplayDirectory();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -368,9 +368,9 @@ uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeExcep</div><div class='ctx'> return m_pImpl->getFiles();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> OSL_ASSERT(0 != m_pImpl.get());</div><div class='hunk'>@@ -408,9 +408,9 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R</div><div class='ctx'> return lTarget.getAsConstList();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -440,9 +440,9 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)</div><div class='ctx'> return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilePicker functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlAction, const uno::Any& aValue)</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -453,9 +453,9 @@ void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlActi</div><div class='ctx'> m_pImpl->setValue(aControlId, aControlAction, aValue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -466,9 +466,9 @@ uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControl</div><div class='ctx'> return m_pImpl->getValue(aControlId, aControlAction);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::enableControl(sal_Int16 aControlId, sal_Bool bEnable)</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -479,9 +479,9 @@ throw(uno::RuntimeException)</div><div class='ctx'> m_pImpl->enableControl( aControlId, bEnable );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel)</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -492,9 +492,9 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel</div><div class='ctx'> m_pImpl->setLabel(aControlId, aLabel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -505,9 +505,9 @@ OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)</div><div class='ctx'> return m_pImpl->getLabel(aControlId);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw (uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -517,9 +517,9 @@ uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw</div><div class='ctx'> return m_pImpl->getSupportedImageFormats();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -529,9 +529,9 @@ sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeExcepti</div><div class='ctx'> return m_pImpl->getTargetColorDepth();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -541,9 +541,9 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException</div><div class='ctx'> return m_pImpl->getAvailableWidth();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -553,9 +553,9 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeExceptio</div><div class='ctx'> return m_pImpl->getAvailableHeight();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)</div><div class='ctx'> throw (lang::IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -566,9 +566,9 @@ void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aIma</div><div class='ctx'> m_pImpl->setImage(aImageFormat, aImage);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -578,9 +578,9 @@ sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::Run</div><div class='ctx'> return m_pImpl->setShowState(bShowState);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -590,9 +590,9 @@ sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)</div><div class='ctx'> return m_pImpl->getShowState();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)</div><div class='ctx'> throw( uno::Exception, uno::RuntimeException)</div><div class='hunk'>@@ -691,9 +691,9 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)</div><div class='ctx'> hInstance ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePicker::cancel()</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -704,9 +704,9 @@ void SAL_CALL CFilePicker::cancel()</div><div class='ctx'> m_pImpl->cancel();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XServiceInfo</div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CFilePicker::getImplementationName()</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -721,9 +721,9 @@ sal_Bool SAL_CALL CFilePicker::supportsService(const OUString& ServiceName)</div><div class='ctx'> return cppu::supportsService(this, ServiceName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XServiceInfo</div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> uno::Sequence<OUString> SAL_CALL CFilePicker::getSupportedServiceNames()</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx<br/>index 53d1e51f2c73..1ca694643b1e 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FilterContainer.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/FilterContainer.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/FilterContainer.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/FilterContainer.cxx</a></div><div class='hunk'>@@ -31,14 +31,14 @@</div><div class='ctx'> #pragma warning(pop)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // namespace directives</div><div class='del'>-//-------------------------------------------------------------------</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> // ctor</div><div class='del'>-//-------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFilterContainer::CFilterContainer( sal_Int32 initSize ) :</div><div class='ctx'> m_vFilters( initSize ),</div><div class='hunk'>@@ -46,9 +46,9 @@ CFilterContainer::CFilterContainer( sal_Int32 initSize ) :</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // add a name/filter pair</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilterContainer::addFilter(</div><div class='ctx'> const OUString& aName, const OUString& aFilter, sal_Bool bAllowDuplicates )</div><div class='hunk'>@@ -74,11 +74,11 @@ sal_Bool SAL_CALL CFilterContainer::addFilter(</div><div class='ctx'> return ( pos < 0 ) ? sal_True : sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // delete a filter</div><div class='ctx'> // Precondition: the container is not empty</div><div class='ctx'> // there is a filter identified by the given name</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilterContainer::delFilter( const OUString& aName )</div><div class='ctx'> {</div><div class='hunk'>@@ -94,29 +94,29 @@ sal_Bool SAL_CALL CFilterContainer::delFilter( const OUString& aName )</div><div class='ctx'> return ( pos > -1 ) ? sal_True : sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // return the number of filters currently in the container</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CFilterContainer::numFilter( )</div><div class='ctx'> {</div><div class='ctx'> return m_vFilters.size( );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // clear all entries</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilterContainer::empty()</div><div class='ctx'> {</div><div class='ctx'> m_vFilters.clear( );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // get a filter by name</div><div class='ctx'> // Precondition: the container is not empty</div><div class='ctx'> // there is a filter identified by the name</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& theFilter ) const</div><div class='ctx'> {</div><div class='hunk'>@@ -138,9 +138,9 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString&</div><div class='ctx'> return (pos > -1 ) ? sal_True : sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const</div><div class='ctx'> {</div><div class='hunk'>@@ -159,18 +159,18 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFi</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CFilterContainer::getFilterPos( const OUString& aName ) const</div><div class='ctx'> {</div><div class='ctx'> return getFilterTagPos( aName );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // returns the index of the filter identified by name</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) const</div><div class='ctx'> {</div><div class='hunk'>@@ -188,9 +188,9 @@ sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) co</div><div class='ctx'> return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // starts enumerating the filter in the container</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilterContainer::beginEnumFilter( )</div><div class='ctx'> {</div><div class='hunk'>@@ -198,9 +198,9 @@ void SAL_CALL CFilterContainer::beginEnumFilter( )</div><div class='ctx'> m_bIterInitialized = sal_True;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // returns true if another filter has been retrieved</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry )</div><div class='ctx'> {</div><div class='hunk'>@@ -216,13 +216,13 @@ sal_Bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEnt</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL CFilterContainer::setCurrentFilter( const OUString& aName )</div><div class='ctx'> {</div><div class='ctx'> m_sCurrentFilter = aName;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString SAL_CALL CFilterContainer::getCurrentFilter() const</div><div class='ctx'> {</div><div class='ctx'> return m_sCurrentFilter;</div><div class='hunk'>@@ -231,11 +231,11 @@ OUString SAL_CALL CFilterContainer::getCurrentFilter() const</div><div class='ctx'> //###################################################################</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // calculates the length of a '\0' separated filter, that means</div><div class='ctx'> // length of the name + '\0' + length of the filter string +</div><div class='ctx'> // a trailing '\0'</div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static sal_uInt32 _getLengthFilter( CFilterContainer::FILTER_ENTRY_T aFilterEntry )</div><div class='ctx'> {</div><div class='hunk'>@@ -244,9 +244,9 @@ static sal_uInt32 _getLengthFilter( CFilterContainer::FILTER_ENTRY_T aFilterEntr</div><div class='ctx'> aFilterEntry.second.getLength( ) + 1 );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // calculates the length of all filters currently in the container</div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> static sal_uInt32 _getTotalFilterLength( CFilterContainer& aFilterContainer )</div><div class='ctx'> {</div><div class='hunk'>@@ -261,9 +261,9 @@ static sal_uInt32 _getTotalFilterLength( CFilterContainer& aFilterContainer )</div><div class='ctx'> return ( totalLength > 0 ) ? totalLength + 1 : totalLength;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength )</div><div class='hunk'>@@ -271,11 +271,11 @@ void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength</div><div class='ctx'> memcpy( pDest, pSrc, nLength * sizeof( sal_Unicode ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // a helper trivial helper function to create a filter buffer in the</div><div class='ctx'> // format the Win32 API requires,</div><div class='ctx'> // e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"</div><div class='del'>-//-------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )</div><div class='ctx'> {</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx<br/>index e061a63f3b3a..55d58e689c08 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/PreviewCtrl.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/PreviewCtrl.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/PreviewCtrl.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/PreviewCtrl.cxx</a></div><div class='hunk'>@@ -41,16 +41,16 @@</div><div class='ctx'> // means 3 pixel top and 3 pixel bottom</div><div class='ctx'> #define VERT_BORDER_SPACE 6</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // static member initialization</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFilePreview* CFilePreview::s_FilePreviewInst = NULL;</div><div class='ctx'> CFilePreview::FILEPREVIEW_SINGLETON_DESTROYER_T CFilePreview::s_SingletonDestroyer;</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // some useful helper functions</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> namespace // private</div><div class='ctx'> {</div><div class='hunk'>@@ -60,9 +60,9 @@ namespace // private</div><div class='ctx'> // of the preview window failed</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> sal_Int32 SubDiv( sal_Int32 nNumber, sal_Int32 nMinuend, sal_Int32 nDenominator )</div><div class='hunk'>@@ -70,9 +70,9 @@ namespace // private</div><div class='ctx'> return ( static_cast<sal_Int32>( ( nNumber - nMinuend ) / nDenominator ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // convert himetric to pixel</div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> sal_Int32 Himetric2Pixel( HDC hDC, sal_Int32 hmSize, sal_Int32 nIndex )</div><div class='hunk'>@@ -80,9 +80,9 @@ namespace // private</div><div class='ctx'> return MulDiv( hmSize, GetDeviceCaps( hDC, nIndex), HIMETRIC_INCH );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> sal_uInt32 _getWidthRect( const RECT& aRect )</div><div class='hunk'>@@ -90,9 +90,9 @@ namespace // private</div><div class='ctx'> return ( aRect.right - aRect.left );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> sal_uInt32 _getHeightRect( const RECT& aRect )</div><div class='hunk'>@@ -100,10 +100,10 @@ namespace // private</div><div class='ctx'> return ( aRect.bottom - aRect.top );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // calc the upper left corner so that a given window will be</div><div class='ctx'> // displayed centered within the given window</div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> POINT _calcULCorner( HWND hwnd, const CDimension& aPicSize )</div><div class='hunk'>@@ -121,11 +121,11 @@ namespace // private</div><div class='ctx'> return ulCorner;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // test if a picture with the given dimensions fits into an</div><div class='ctx'> // arbitrary window</div><div class='ctx'> // we expect the width and height to be in pixel</div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> sal_Bool _pictureSizeFitsWindowSize( HWND hwnd, const CDimension& aPicSize )</div><div class='hunk'>@@ -140,11 +140,11 @@ namespace // private</div><div class='ctx'> ( ( nHeightWnd - VERT_BORDER_SPACE ) >= aPicSize.m_cy ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // calc the dimemsions so that a given picture fits into a</div><div class='ctx'> // given window, if the picture fits into the given window</div><div class='ctx'> // the original CDimension will be returned</div><div class='del'>- //------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline</div><div class='ctx'> CDimension _scalePictureSize( HWND hwnd, const CDimension& aPicSize )</div><div class='hunk'>@@ -183,9 +183,9 @@ namespace // private</div><div class='ctx'> } // end namespace</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // to ensure only one instance (singleton)</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFilePreview* CFilePreview::createInstance(</div><div class='ctx'> HWND aParent,</div><div class='hunk'>@@ -218,9 +218,9 @@ CFilePreview* CFilePreview::createInstance(</div><div class='ctx'> return s_FilePreviewInst;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFilePreview::CFilePreview(</div><div class='ctx'> HWND aParent,</div><div class='hunk'>@@ -272,9 +272,9 @@ CFilePreview::CFilePreview(</div><div class='ctx'> throw CPreviewException( );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CFilePreview::~CFilePreview( )</div><div class='ctx'> {</div><div class='hunk'>@@ -285,9 +285,9 @@ CFilePreview::~CFilePreview( )</div><div class='ctx'> OSL_POSTCOND( bRet, "Unregister preview window class failed" );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // sets the size of the preview window</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePreview::setSize( const CDimension& aSize )</div><div class='ctx'> {</div><div class='hunk'>@@ -304,9 +304,9 @@ sal_Bool SAL_CALL CFilePreview::setSize( const CDimension& aSize )</div><div class='ctx'> SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // returns the dimension of the preview</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePreview::getSize( CDimension& theSize ) const</div><div class='ctx'> {</div><div class='hunk'>@@ -321,11 +321,11 @@ sal_Bool SAL_CALL CFilePreview::getSize( CDimension& theSize ) const</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // sets the position of the upper left corner</div><div class='ctx'> // of the preview window relative to the</div><div class='ctx'> // upper left corner of the parent window</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePreview::setPos( POINT ulCorner )</div><div class='ctx'> {</div><div class='hunk'>@@ -342,11 +342,11 @@ sal_Bool SAL_CALL CFilePreview::setPos( POINT ulCorner )</div><div class='ctx'> SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // returns the current position of the preview</div><div class='ctx'> // relative to the upper left corner of the</div><div class='ctx'> // parent window</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePreview::getPos( POINT& ulCorner ) const</div><div class='ctx'> {</div><div class='hunk'>@@ -365,9 +365,9 @@ sal_Bool SAL_CALL CFilePreview::getPos( POINT& ulCorner ) const</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePreview::enable( sal_Bool bEnable )</div><div class='ctx'> {</div><div class='hunk'>@@ -378,14 +378,14 @@ void SAL_CALL CFilePreview::enable( sal_Bool bEnable )</div><div class='ctx'> UpdateWindow( m_hwnd );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // shows the preview window</div><div class='ctx'> // possible values see SHOW_STATE</div><div class='ctx'> // SS_SHOW - make the window visible</div><div class='ctx'> // SS_HIDE - hide the window</div><div class='ctx'> // SS_ENABLED - enable the window</div><div class='ctx'> // SS_DISABLED - disable the window</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePreview::show( sal_Bool bShow )</div><div class='ctx'> {</div><div class='hunk'>@@ -395,12 +395,12 @@ sal_Bool SAL_CALL CFilePreview::show( sal_Bool bShow )</div><div class='ctx'> return ShowWindow( m_hwnd, showState );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // if the preview is shown and enabled</div><div class='ctx'> // preview of the given file will be shown</div><div class='ctx'> // returns true on success or false if an error</div><div class='ctx'> // occurred (the file in not there or not accessible etc.)</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName )</div><div class='ctx'> {</div><div class='hunk'>@@ -427,9 +427,9 @@ sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName )</div><div class='ctx'> return sal_True;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC )</div><div class='ctx'> {</div><div class='hunk'>@@ -480,9 +480,9 @@ void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC )</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool CFilePreview::loadFile( const OUString& aFileName )</div><div class='ctx'> {</div><div class='hunk'>@@ -551,9 +551,9 @@ CLEANUP_AND_EXIT:</div><div class='ctx'> return ( SUCCEEDED( hr ) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//---------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> LRESULT CALLBACK CFilePreview::WndProc(</div><div class='ctx'> HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx<br/>index e1a29dcd8cee..d0d22a5319a2 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/VistaFilePicker.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/VistaFilePicker.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/VistaFilePicker.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/VistaFilePicker.cxx</a></div><div class='hunk'>@@ -56,9 +56,9 @@</div><div class='ctx'> #pragma warning (pop)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // namespace directives</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> namespace fpicker{</div><div class='ctx'> namespace win32{</div><div class='hunk'>@@ -66,9 +66,9 @@ namespace vista{</div><div class='ctx'> </div><div class='ctx'> #define FILE_PICKER_DLL_NAME TEXT("fps.dll")</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // helper functions</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> namespace</div><div class='ctx'> {</div><div class='hunk'>@@ -85,7 +85,7 @@ namespace</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> VistaFilePicker::VistaFilePicker(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)</div><div class='ctx'> : TVistaFilePickerBase (m_aMutex )</div><div class='ctx'> , m_xSMGR (xSMGR )</div><div class='hunk'>@@ -96,12 +96,12 @@ VistaFilePicker::VistaFilePicker(const css::uno::Reference< css::lang::XMultiSer</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> VistaFilePicker::~VistaFilePicker()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener)</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -112,7 +112,7 @@ void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference<</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -123,13 +123,13 @@ void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Referenc</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/)</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::setMultiSelectionMode(::sal_Bool bMode)</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -140,7 +140,7 @@ void SAL_CALL VistaFilePicker::setMultiSelectionMode(::sal_Bool bMode)</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -151,7 +151,7 @@ void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,</div><div class='ctx'> const OUString& sFilter)</div><div class='ctx'> throw(css::lang::IllegalArgumentException,</div><div class='hunk'>@@ -165,7 +165,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)</div><div class='ctx'> throw(css::lang::IllegalArgumentException,</div><div class='ctx'> css::uno::RuntimeException )</div><div class='hunk'>@@ -177,7 +177,7 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString SAL_CALL VistaFilePicker::getCurrentFilter()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,7 +190,7 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()</div><div class='ctx'> return sTitle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString& /*sGroupTitle*/,</div><div class='ctx'> const css::uno::Sequence< css::beans::StringPair >& rFilters )</div><div class='ctx'> throw (css::lang::IllegalArgumentException,</div><div class='hunk'>@@ -203,7 +203,7 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString&</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -214,7 +214,7 @@ void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)</div><div class='ctx'> throw (css::lang::IllegalArgumentException,</div><div class='ctx'> css::uno::RuntimeException )</div><div class='hunk'>@@ -239,7 +239,7 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString SAL_CALL VistaFilePicker::getDisplayDirectory()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -251,7 +251,7 @@ OUString SAL_CALL VistaFilePicker::getDisplayDirectory()</div><div class='ctx'> return sDirectory;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // @deprecated cant be supported any longer ... see IDL description for further details</div><div class='ctx'> css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='hunk'>@@ -266,7 +266,7 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()</div><div class='ctx'> return lFiles;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -280,7 +280,7 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()</div><div class='ctx'> return lFiles;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> ::sal_Int16 SAL_CALL VistaFilePicker::execute()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -313,9 +313,9 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()</div><div class='ctx'> return nResult;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilePicker functions</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL VistaFilePicker::setValue( ::sal_Int16 nControlId ,</div><div class='ctx'> ::sal_Int16 nControlAction,</div><div class='hunk'>@@ -331,9 +331,9 @@ void SAL_CALL VistaFilePicker::setValue( ::sal_Int16 nControlId ,</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId ,</div><div class='ctx'> ::sal_Int16 nControlAction)</div><div class='hunk'>@@ -349,9 +349,9 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId ,</div><div class='ctx'> return aValue;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,</div><div class='ctx'> ::sal_Bool bEnable )</div><div class='hunk'>@@ -365,9 +365,9 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,</div><div class='ctx'> const OUString& sLabel )</div><div class='hunk'>@@ -381,9 +381,9 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId,</div><div class='ctx'> m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)</div><div class='ctx'> throw (css::uno::RuntimeException)</div><div class='hunk'>@@ -397,9 +397,9 @@ OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)</div><div class='ctx'> return sLabel;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFormats()</div><div class='ctx'> throw (css::uno::RuntimeException)</div><div class='hunk'>@@ -407,9 +407,9 @@ css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFor</div><div class='ctx'> return css::uno::Sequence< sal_Int16 >();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth()</div><div class='ctx'> throw (css::uno::RuntimeException)</div><div class='hunk'>@@ -417,9 +417,9 @@ sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth()</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth()</div><div class='ctx'> throw (css::uno::RuntimeException)</div><div class='hunk'>@@ -427,9 +427,9 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth()</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight()</div><div class='ctx'> throw (css::uno::RuntimeException)</div><div class='hunk'>@@ -437,9 +437,9 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight()</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/,</div><div class='ctx'> const css::uno::Any& /*aImage */)</div><div class='hunk'>@@ -448,9 +448,9 @@ void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/,</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/)</div><div class='ctx'> throw (css::uno::RuntimeException)</div><div class='hunk'>@@ -458,9 +458,9 @@ sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/)</div><div class='ctx'> return sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL VistaFilePicker::getShowState()</div><div class='ctx'> throw (css::uno::RuntimeException)</div><div class='hunk'>@@ -468,9 +468,9 @@ sal_Bool SAL_CALL VistaFilePicker::getShowState()</div><div class='ctx'> return sal_False;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)</div><div class='ctx'> throw(css::uno::Exception ,</div><div class='hunk'>@@ -592,18 +592,18 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL VistaFilePicker::cancel()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XServiceInfo</div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL VistaFilePicker::getImplementationName()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='hunk'>@@ -618,9 +618,9 @@ sal_Bool SAL_CALL VistaFilePicker::supportsService(const OUString& sServiceName)</div><div class='ctx'> return cppu::supportsService(this, sServiceName);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XServiceInfo</div><div class='del'>-// -------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()</div><div class='ctx'> throw(css::uno::RuntimeException)</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx<br/>index 3935ca298bb5..e6cec940e2b8 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx</a></div><div class='hunk'>@@ -37,15 +37,15 @@</div><div class='ctx'> </div><div class='ctx'> #include <osl/file.hxx></div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // namespace directives</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> namespace fpicker{</div><div class='ctx'> namespace win32{</div><div class='ctx'> namespace vista{</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> VistaFilePickerEventHandler::VistaFilePickerEventHandler(IVistaFilePickerInternalNotify* pInternalNotify)</div><div class='ctx'> : m_nRefCount (0 )</div><div class='ctx'> , m_nListenerHandle (0 )</div><div class='hunk'>@@ -55,12 +55,12 @@ VistaFilePickerEventHandler::VistaFilePickerEventHandler(IVistaFilePickerInterna</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> VistaFilePickerEventHandler::~VistaFilePickerEventHandler()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> HRESULT STDMETHODCALLTYPE VistaFilePickerEventHandler::QueryInterface(REFIID rIID ,</div><div class='ctx'> void** ppObject)</div><div class='ctx'> {</div><div class='hunk'>@@ -84,13 +84,13 @@ HRESULT STDMETHODCALLTYPE VistaFilePickerEventHandler::QueryInterface(REFIID rII</div><div class='ctx'> return E_NOINTERFACE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef()</div><div class='ctx'> {</div><div class='ctx'> return osl_atomic_increment(&m_nRefCount);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()</div><div class='ctx'> {</div><div class='ctx'> ULONG nReturn = --m_nRefCount;</div><div class='hunk'>@@ -100,34 +100,34 @@ ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()</div><div class='ctx'> return nReturn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnFileOk(IFileDialog* /*pDialog*/)</div><div class='ctx'> {</div><div class='ctx'> return E_NOTIMPL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnFolderChanging(IFileDialog* /*pDialog*/,</div><div class='ctx'> IShellItem* /*pFolder*/)</div><div class='ctx'> {</div><div class='ctx'> return E_NOTIMPL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* /*pDialog*/)</div><div class='ctx'> {</div><div class='ctx'> impl_sendEvent(E_DIRECTORY_CHANGED, 0);</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnSelectionChange(IFileDialog* /*pDialog*/)</div><div class='ctx'> {</div><div class='ctx'> impl_sendEvent(E_FILE_SELECTION_CHANGED, 0);</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnShareViolation(IFileDialog* /*pDialog*/ ,</div><div class='ctx'> </div><div class='ctx'> IShellItem* /*pItem*/ ,</div><div class='hunk'>@@ -138,7 +138,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnShareViolation(IFileDialog*</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* pDialog)</div><div class='ctx'> {</div><div class='ctx'> UINT nFileTypeIndex;</div><div class='hunk'>@@ -153,7 +153,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* pDialog)</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnOverwrite(IFileDialog* /*pDialog*/ ,</div><div class='ctx'> IShellItem* /*pItem*/ ,</div><div class='ctx'> FDE_OVERWRITE_RESPONSE* /*pResponse*/)</div><div class='hunk'>@@ -161,7 +161,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnOverwrite(IFileDialog* /*</div><div class='ctx'> return E_NOTIMPL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnItemSelected(IFileDialogCustomize* /*pCustomize*/,</div><div class='ctx'> </div><div class='ctx'> DWORD nIDCtl ,</div><div class='hunk'>@@ -173,7 +173,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnItemSelected(IFileDialogCustomize* /</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize* /*pCustomize*/,</div><div class='ctx'> DWORD nIDCtl )</div><div class='ctx'> {</div><div class='hunk'>@@ -182,7 +182,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize*</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustomize* /*pCustomize*/,</div><div class='ctx'> DWORD nIDCtl ,</div><div class='ctx'> BOOL bChecked )</div><div class='hunk'>@@ -195,7 +195,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustom</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomize* /*pCustomize*/,</div><div class='ctx'> DWORD nIDCtl )</div><div class='ctx'> {</div><div class='hunk'>@@ -203,21 +203,21 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi</div><div class='ctx'> return S_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )</div><div class='ctx'> throw( css::uno::RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> m_lListener.addInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )</div><div class='ctx'> throw( css::uno::RuntimeException )</div><div class='ctx'> {</div><div class='ctx'> m_lListener.removeInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerEventHandler::startListening( const TFileDialog& pBroadcaster )</div><div class='ctx'> {</div><div class='ctx'> static const sal_Bool STARTUP_SUSPENDED = sal_True;</div><div class='hunk'>@@ -230,7 +230,7 @@ void VistaFilePickerEventHandler::startListening( const TFileDialog& pBroadcaste</div><div class='ctx'> m_pDialog->Advise(this, &m_nListenerHandle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerEventHandler::stopListening()</div><div class='ctx'> {</div><div class='ctx'> if (m_pDialog.is())</div><div class='hunk'>@@ -243,7 +243,7 @@ void VistaFilePickerEventHandler::stopListening()</div><div class='ctx'> static const OUString PROP_CONTROL_ID("control_id");</div><div class='ctx'> static const OUString PROP_PICKER_LISTENER("picker_listener");</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> class AsyncPickerEvents : public RequestHandler</div><div class='ctx'> {</div><div class='ctx'> public:</div><div class='hunk'>@@ -299,7 +299,7 @@ public:</div><div class='ctx'> {}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerEventHandler::impl_sendEvent( EEventType eEventType,</div><div class='ctx'> ::sal_Int16 nControlID)</div><div class='ctx'> {</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx<br/>index 64eb6752e79d..e892523a3ec2 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx</a></div><div class='hunk'>@@ -55,9 +55,9 @@ namespace fpicker{</div><div class='ctx'> namespace win32{</div><div class='ctx'> namespace vista{</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // types, const etcpp.</div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const ::sal_Int16 INVALID_CONTROL_ID = -1;</div><div class='hunk'>@@ -75,7 +75,7 @@ static const GUID CLIENTID_FILEOPEN_LINK_TEMPLATE = {0x32237796, 0x1509, 0x49D</div><div class='ctx'> static const GUID CLIENTID_FILEOPEN_PLAY = {0x32CFB147, 0xF5AE, 0x4F90, 0xA1, 0xF1, 0x81, 0x20, 0x72, 0xBB, 0x2F, 0xC5};</div><div class='ctx'> static const GUID CLIENTID_FILEOPEN_LINK = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> OUString lcl_getURLFromShellItem (IShellItem* pItem)</div><div class='ctx'> {</div><div class='ctx'> LPOLESTR pStr = NULL;</div><div class='hunk'>@@ -103,7 +103,7 @@ OUString lcl_getURLFromShellItem (IShellItem* pItem)</div><div class='ctx'> return sURL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> ::std::vector< COMDLG_FILTERSPEC > lcl_buildFilterList(CFilterContainer& rContainer)</div><div class='ctx'> {</div><div class='ctx'> const sal_Int32 c = rContainer.numFilter();</div><div class='hunk'>@@ -125,7 +125,7 @@ OUString lcl_getURLFromShellItem (IShellItem* pItem)</div><div class='ctx'> return lList;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> VistaFilePickerImpl::VistaFilePickerImpl()</div><div class='ctx'> : m_iDialogOpen ()</div><div class='ctx'> , m_iDialogSave ()</div><div class='hunk'>@@ -141,12 +141,12 @@ VistaFilePickerImpl::VistaFilePickerImpl()</div><div class='ctx'> m_hParentWindow = choose_parent_window();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> VistaFilePickerImpl::~VistaFilePickerImpl()</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::before()</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED-></div><div class='hunk'>@@ -167,7 +167,7 @@ void VistaFilePickerImpl::before()</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::doRequest(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> try</div><div class='hunk'>@@ -265,13 +265,13 @@ void VistaFilePickerImpl::doRequest(const RequestRef& rRequest)</div><div class='ctx'> {}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::after()</div><div class='ctx'> {</div><div class='ctx'> CoUninitialize();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_addFilePickerListener(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED outside !</div><div class='hunk'>@@ -290,7 +290,7 @@ void VistaFilePickerImpl::impl_sta_addFilePickerListener(const RequestRef& rRequ</div><div class='ctx'> pHandlerImpl->addFilePickerListener(xListener);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_removeFilePickerListener(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED outside !</div><div class='hunk'>@@ -309,7 +309,7 @@ void VistaFilePickerImpl::impl_sta_removeFilePickerListener(const RequestRef& rR</div><div class='ctx'> pHandlerImpl->removeFilePickerListener(xListener);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_appendFilter(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());</div><div class='hunk'>@@ -321,7 +321,7 @@ void VistaFilePickerImpl::impl_sta_appendFilter(const RequestRef& rRequest)</div><div class='ctx'> m_lFilters.addFilter(sTitle, sFilter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> const css::uno::Sequence< css::beans::StringPair > aFilterGroup =</div><div class='hunk'>@@ -343,7 +343,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_setCurrentFilter(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());</div><div class='hunk'>@@ -354,7 +354,7 @@ void VistaFilePickerImpl::impl_sta_setCurrentFilter(const RequestRef& rRequest)</div><div class='ctx'> m_lFilters.setCurrentFilter(sTitle);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> TFileDialog iDialog = impl_getBaseDialogInterface();</div><div class='hunk'>@@ -386,7 +386,7 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)</div><div class='ctx'> // <- SYNCHRONIZED</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_CreateOpenDialog(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED-></div><div class='hunk'>@@ -428,7 +428,7 @@ void VistaFilePickerImpl::impl_sta_CreateOpenDialog(const RequestRef& rRequest)</div><div class='ctx'> pHandlerImpl->startListening(iDialog);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_CreateSaveDialog(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED-></div><div class='hunk'>@@ -469,13 +469,13 @@ void VistaFilePickerImpl::impl_sta_CreateSaveDialog(const RequestRef& rRequest)</div><div class='ctx'> pHandlerImpl->startListening(iDialog);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> static const ::sal_Int32 GROUP_VERSION = 1;</div><div class='ctx'> static const ::sal_Int32 GROUP_TEMPLATE = 2;</div><div class='ctx'> static const ::sal_Int32 GROUP_IMAGETEMPLATE = 3;</div><div class='ctx'> static const ::sal_Int32 GROUP_CHECKBOXES = 4;</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogCustomize iCustom, sal_uInt16 nControlId)</div><div class='ctx'> {</div><div class='ctx'> OUString aLabel = rResourceProvider.getResString(nControlId);</div><div class='hunk'>@@ -483,7 +483,7 @@ static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogC</div><div class='ctx'> iCustom->SetControlLabel(nControlId, reinterpret_cast<LPCWSTR>(aLabel.getStr()) );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_Int32 nTemplate)</div><div class='ctx'> {</div><div class='ctx'> GUID aGUID = {};</div><div class='hunk'>@@ -610,7 +610,7 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_SetMultiSelectionMode(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> const ::sal_Bool bMultiSelection = rRequest->getArgumentOrDefault(PROP_MULTISELECTION_MODE, (::sal_Bool)sal_True);</div><div class='hunk'>@@ -632,7 +632,7 @@ void VistaFilePickerImpl::impl_sta_SetMultiSelectionMode(const RequestRef& rRequ</div><div class='ctx'> iDialog->SetOptions ( nFlags );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> OUString sTitle = rRequest->getArgumentOrDefault(PROP_TITLE, OUString());</div><div class='hunk'>@@ -646,7 +646,7 @@ void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)</div><div class='ctx'> iDialog->SetTitle(reinterpret_cast<LPCTSTR>(sTitle.getStr()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> OUString sFileName = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());</div><div class='hunk'>@@ -660,7 +660,7 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)</div><div class='ctx'> iDialog->SetFileName(reinterpret_cast<LPCTSTR>(sFileName.getStr()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, OUString());</div><div class='hunk'>@@ -712,7 +712,7 @@ void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest)</div><div class='ctx'> rRequest->setArgument( PROP_DIRECTORY, sFolder );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_SetDefaultName(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> OUString sFilename = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());</div><div class='hunk'>@@ -737,7 +737,7 @@ void VistaFilePickerImpl::impl_sta_SetDefaultName(const RequestRef& rRequest)</div><div class='ctx'> m_sFilename = sFilename;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED-></div><div class='hunk'>@@ -774,7 +774,7 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED-></div><div class='hunk'>@@ -848,7 +848,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)</div><div class='ctx'> rRequest->setArgument(PROP_SELECTED_FILES, lFiles.getAsConstList());</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> impl_sta_setFiltersOnDialog();</div><div class='hunk'>@@ -960,7 +960,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)</div><div class='ctx'> rRequest->setArgument(PROP_DIALOG_SHOW_RESULT, sal_True);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> TFileDialog VistaFilePickerImpl::impl_getBaseDialogInterface()</div><div class='ctx'> {</div><div class='ctx'> TFileDialog iDialog;</div><div class='hunk'>@@ -984,7 +984,7 @@ TFileDialog VistaFilePickerImpl::impl_getBaseDialogInterface()</div><div class='ctx'> return iDialog;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> TFileDialogCustomize VistaFilePickerImpl::impl_getCustomizeInterface()</div><div class='ctx'> {</div><div class='ctx'> TFileDialogCustomize iCustom;</div><div class='hunk'>@@ -1009,7 +1009,7 @@ TFileDialogCustomize VistaFilePickerImpl::impl_getCustomizeInterface()</div><div class='ctx'> return iCustom;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void lcl_removeControlItemsWorkaround(const TFileDialogCustomize& iCustom ,</div><div class='ctx'> ::sal_Int16 nControlId)</div><div class='ctx'> {</div><div class='hunk'>@@ -1022,7 +1022,7 @@ void lcl_removeControlItemsWorkaround(const TFileDialogCustomize& iCustom ,</div><div class='ctx'> hResult = iCustom->RemoveControlItem(nControlId, i++);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_SetControlValue(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> ::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );</div><div class='hunk'>@@ -1097,7 +1097,7 @@ void VistaFilePickerImpl::impl_sta_SetControlValue(const RequestRef& rRequest)</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> ::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );</div><div class='hunk'>@@ -1133,7 +1133,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)</div><div class='ctx'> rRequest->setArgument(PROP_CONTROL_VALUE, aValue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_SetControlLabel(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> ::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );</div><div class='hunk'>@@ -1148,12 +1148,12 @@ void VistaFilePickerImpl::impl_sta_SetControlLabel(const RequestRef& rRequest)</div><div class='ctx'> iCustom->SetControlLabel ( nId, reinterpret_cast<LPCTSTR>(sLabel.getStr()));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_GetControlLabel(const RequestRef& /*rRequest*/)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest)</div><div class='ctx'> {</div><div class='ctx'> ::sal_Int16 nId = rRequest->getArgumentOrDefault(PROP_CONTROL_ID , INVALID_CONTROL_ID );</div><div class='hunk'>@@ -1174,7 +1174,7 @@ void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest)</div><div class='ctx'> </div><div class='ctx'> iCustom->SetControlState(nId, eState);</div><div class='ctx'> }</div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::impl_SetDefaultExtension( const OUString& currentFilter )</div><div class='ctx'> {</div><div class='ctx'> TFileDialog iDialog = impl_getBaseDialogInterface();</div><div class='hunk'>@@ -1217,7 +1217,7 @@ static void impl_refreshFileDialog( TFileDialog iDialog )</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> void VistaFilePickerImpl::onAutoExtensionChanged (bool bChecked)</div><div class='ctx'> {</div><div class='ctx'> // SYNCHRONIZED-></div><div class='head'>diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx<br/>index ee2760b5c878..a493af6cc4e0 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/WinFileOpenImpl.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/WinFileOpenImpl.cxx</a></div><div class='hunk'>@@ -36,9 +36,9 @@</div><div class='ctx'> #include <osl/thread.hxx></div><div class='ctx'> #include "filepickerstate.hxx"</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // namespace directives</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> using namespace com::sun::star;</div><div class='ctx'> </div><div class='hunk'>@@ -50,9 +50,9 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;</div><div class='ctx'> using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;</div><div class='ctx'> using namespace ::com::sun::star::ui::dialogs::ListboxControlActions;</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // to distinguish what to do in the enum child window callback function</div><div class='del'>-//-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> enum ECW_ACTION_T</div><div class='ctx'> {</div><div class='hunk'>@@ -71,9 +71,9 @@ struct EnumParam</div><div class='ctx'> {}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-//-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // ctor</div><div class='del'>-//-------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CWinFileOpenImpl::CWinFileOpenImpl(</div><div class='ctx'> CFilePicker* aFilePicker,</div><div class='hunk'>@@ -95,9 +95,9 @@ CWinFileOpenImpl::CWinFileOpenImpl(</div><div class='ctx'> m_FilePickerState = m_NonExecuteFilePickerState;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // dtor</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CWinFileOpenImpl::~CWinFileOpenImpl()</div><div class='ctx'> {</div><div class='hunk'>@@ -105,9 +105,9 @@ CWinFileOpenImpl::~CWinFileOpenImpl()</div><div class='ctx'> delete m_NonExecuteFilePickerState;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // we expect the directory in URL format</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)</div><div class='ctx'> throw( IllegalArgumentException, uno::RuntimeException )</div><div class='hunk'>@@ -135,18 +135,18 @@ void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)</div><div class='ctx'> CFileOpenDialog::setDisplayDirectory(aSysDirectory);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // we return the directory in URL format</div><div class='del'>-//------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='ctx'> return m_FilePickerState->getDisplayDirectory(this);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)</div><div class='ctx'> throw( IllegalArgumentException, uno::RuntimeException )</div><div class='hunk'>@@ -161,13 +161,13 @@ void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)</div><div class='ctx'> m_defaultName = aName;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // return format: URL</div><div class='ctx'> // if multiselection is allowed there are two different cases</div><div class='ctx'> // 1. one file selected: the sequence contains one entry path\filename.ext</div><div class='ctx'> // 2. multiple files selected: the sequence contains multiple entries</div><div class='ctx'> // the first entry is the path url, all other entries are file names</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -175,9 +175,9 @@ uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()</div><div class='ctx'> return m_FilePickerState->getFiles(this);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // shows the FileOpen/FileSave dialog</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -195,11 +195,11 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute( ) throw(uno::RuntimeException)</div><div class='ctx'> return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // appends a new filter</div><div class='ctx'> // returns false if the title (aTitle) was already added or the title or the filter are</div><div class='ctx'> // empty</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUString& aFilter)</div><div class='ctx'> throw(IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -222,9 +222,9 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUStr</div><div class='ctx'> CFileOpenDialog::setFilterIndex(1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // sets a current filter</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)</div><div class='ctx'> throw( IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -240,9 +240,9 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)</div><div class='ctx'> CFileOpenDialog::setFilterIndex(filterPos + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // returns the currently selected filter</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)</div><div class='ctx'> {</div><div class='hunk'>@@ -260,18 +260,18 @@ OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeExcepti</div><div class='ctx'> return currentFilter;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator()</div><div class='ctx'> {</div><div class='ctx'> m_filterContainer->addFilter(FILTER_SEPARATOR, ALL_FILES_WILDCARD, ALLOW_DUPLICATES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // XFilterGroupManager</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)</div><div class='ctx'> throw (IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -319,10 +319,10 @@ void SAL_CALL CWinFileOpenImpl::setValue(sal_Int16 aControlId, sal_Int16 aContro</div><div class='ctx'> m_FilePickerState->setValue(aControlId, aControlAction, aValue);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // returns the value of an custom template element</div><div class='ctx'> // we assume that there are only checkboxes or comboboxes</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -334,9 +334,9 @@ uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aCo</div><div class='ctx'> return uno::Any();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // enables a custom template element</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEnable)</div><div class='ctx'> throw(uno::RuntimeException)</div><div class='hunk'>@@ -346,9 +346,9 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEna</div><div class='ctx'> m_FilePickerState->enableControl(ControlID, bEnable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel )</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -358,9 +358,9 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString&</div><div class='ctx'> m_FilePickerState->setLabel(aControlId, aLabel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -372,9 +372,9 @@ OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )</div><div class='ctx'> return OUString();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats()</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -382,9 +382,9 @@ uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats()</div><div class='ctx'> return m_Preview->getSupportedImageFormats();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth()</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -392,9 +392,9 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth()</div><div class='ctx'> return m_Preview->getTargetColorDepth();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth()</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -402,9 +402,9 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth()</div><div class='ctx'> return m_Preview->getAvailableWidth();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight()</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -412,9 +412,9 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight()</div><div class='ctx'> return m_Preview->getAvailableHeight();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)</div><div class='ctx'> throw (IllegalArgumentException, uno::RuntimeException)</div><div class='hunk'>@@ -422,9 +422,9 @@ void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any&</div><div class='ctx'> m_Preview->setImage(aImageFormat,aImage);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState)</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -432,9 +432,9 @@ sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState)</div><div class='ctx'> return m_Preview->setShowState(bShowState);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Bool SAL_CALL CWinFileOpenImpl::getShowState()</div><div class='ctx'> throw (uno::RuntimeException)</div><div class='hunk'>@@ -442,9 +442,9 @@ sal_Bool SAL_CALL CWinFileOpenImpl::getShowState()</div><div class='ctx'> return m_Preview->getShowState();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::cancel()</div><div class='ctx'> {</div><div class='hunk'>@@ -460,9 +460,9 @@ void SAL_CALL CWinFileOpenImpl::cancel()</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // returns the id of a custom template element</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int16 SAL_CALL CWinFileOpenImpl::getFocused()</div><div class='ctx'> {</div><div class='hunk'>@@ -477,20 +477,20 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::getFocused()</div><div class='ctx'> return sal::static_int_cast< sal_Int16 >(nID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> inline sal_Bool SAL_CALL CWinFileOpenImpl::IsCustomControlHelpRequested(LPHELPINFO lphi) const</div><div class='ctx'> {</div><div class='ctx'> return ((lphi->iCtrlId != IDOK) && (lphi->iCtrlId != IDCANCEL) && (lphi->iCtrlId < ctlFirst));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // our own DlgProc because we do subclass the dialog</div><div class='ctx'> // we catch the WM_NCDESTROY message in order to erase an entry in our static map</div><div class='ctx'> // if one instance dies</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(</div><div class='ctx'> HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam)</div><div class='hunk'>@@ -559,15 +559,15 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(</div><div class='ctx'> return lResult;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)</div><div class='ctx'> {</div><div class='del'>- //-----------------------------------------</div><div class='add'>+</div><div class='ctx'> // set the labels for all extendet controls</div><div class='del'>- //-----------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_Int16 aCtrlId = sal::static_int_cast< sal_Int16 >(GetDlgCtrlID(hWnd));</div><div class='ctx'> OUString aLabel = m_ResProvider.getResString(aCtrlId);</div><div class='hunk'>@@ -575,7 +575,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)</div><div class='ctx'> setLabel(aCtrlId, aLabel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // There may be problems with the layout of our custom controls,</div><div class='ctx'> // so that they are not aligned with the standard controls of the</div><div class='ctx'> // FileOpen dialog.</div><div class='hunk'>@@ -587,7 +587,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)</div><div class='ctx'> // the standard combobox cmb13 (defined in MS platform sdk dlgs.h)</div><div class='ctx'> // and all push buttons will be left aligned with the standard</div><div class='ctx'> // "OK" button</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl)</div><div class='ctx'> {</div><div class='hunk'>@@ -595,9 +595,9 @@ void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl)</div><div class='ctx'> m_CustomControlFactory->CreateCustomControl(hCustomControl,m_hwndFileOpenDlg));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd)</div><div class='ctx'> {</div><div class='hunk'>@@ -605,9 +605,9 @@ void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd)</div><div class='ctx'> m_ExecuteFilePickerState->cacheControlState(hWnd, m_NonExecuteFilePickerState);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)</div><div class='ctx'> {</div><div class='hunk'>@@ -637,9 +637,9 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)</div><div class='ctx'> return bRet;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk()</div><div class='ctx'> {</div><div class='hunk'>@@ -655,9 +655,9 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk()</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::onSelChanged(HWND)</div><div class='ctx'> {</div><div class='hunk'>@@ -790,9 +790,9 @@ void SAL_CALL CWinFileOpenImpl::onInitDone()</div><div class='ctx'> CFileOpenDialog::onInitDone();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::onFolderChanged()</div><div class='ctx'> {</div><div class='hunk'>@@ -800,9 +800,9 @@ void SAL_CALL CWinFileOpenImpl::onFolderChanged()</div><div class='ctx'> m_FilePicker->directoryChanged(evt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32)</div><div class='ctx'> {</div><div class='hunk'>@@ -813,9 +813,9 @@ void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32)</div><div class='ctx'> m_FilePicker->controlStateChanged(evt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // onMessageCommand handler</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand(</div><div class='ctx'> HWND, sal_uInt16 ctrlId, sal_uInt16)</div><div class='hunk'>@@ -832,9 +832,9 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand(</div><div class='ctx'> return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CWinFileOpenImpl::onWMSize()</div><div class='ctx'> {</div><div class='hunk'>@@ -843,27 +843,27 @@ void CWinFileOpenImpl::onWMSize()</div><div class='ctx'> m_FilePicker->dialogSizeChanged();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CWinFileOpenImpl::onWMShow(sal_Bool bShow)</div><div class='ctx'> {</div><div class='ctx'> m_Preview->notifyParentShow(bShow);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CWinFileOpenImpl::onWMWindowPosChanged()</div><div class='ctx'> {</div><div class='ctx'> m_Preview->notifyParentWindowPosChanged();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)</div><div class='ctx'> {</div><div class='hunk'>@@ -881,9 +881,9 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg)</div><div class='ctx'> {</div><div class='hunk'>@@ -894,9 +894,9 @@ void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg)</div><div class='ctx'> reinterpret_cast<LONG_PTR>(SubClassFunc)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // processing before showing the dialog</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> bool SAL_CALL CWinFileOpenImpl::preModal()</div><div class='ctx'> {</div><div class='hunk'>@@ -906,9 +906,9 @@ bool SAL_CALL CWinFileOpenImpl::preModal()</div><div class='ctx'> return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> // processing after showing the dialog</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CWinFileOpenImpl::postModal(sal_Int16 nDialogResult)</div><div class='ctx'> {</div><div class='hunk'>@@ -922,9 +922,9 @@ void CWinFileOpenImpl::postModal(sal_Int16 nDialogResult)</div><div class='ctx'> m_FilePickerState = m_NonExecuteFilePickerState;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()</div><div class='ctx'> {</div><div class='hunk'>@@ -972,9 +972,9 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()</div><div class='ctx'> // !!! HACK !!!</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//-----------------------------------------------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()</div><div class='ctx'> {</div><div class='head'>diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx<br/>index 1d7450c5e5ef..35599c87e0d1 100644<br/>--- a/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/asynceventnotifier.cxx?h=feature/unostyles3&id=b81ac16e65b311d6e43c05c22c65d2040c9d7e04'>fpicker/source/win32/filepicker/asynceventnotifier.cxx</a><br/>+++ b/<a href='/cgit/lo/core/tree/fpicker/source/win32/filepicker/asynceventnotifier.cxx?h=feature/unostyles3&id=0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf'>fpicker/source/win32/filepicker/asynceventnotifier.cxx</a></div><div class='hunk'>@@ -26,16 +26,16 @@</div><div class='ctx'> #include <memory></div><div class='ctx'> #include "SolarMutex.hxx"</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> using namespace com::sun::star;</div><div class='ctx'> using ::com::sun::star::ui::dialogs::XFilePickerListener;</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelper) :</div><div class='ctx'> m_hThread(0),</div><div class='hunk'>@@ -58,9 +58,9 @@ CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelpe</div><div class='ctx'> 0); /* automatic name */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CAsyncEventNotifier::~CAsyncEventNotifier()</div><div class='ctx'> {</div><div class='hunk'>@@ -70,9 +70,9 @@ CAsyncEventNotifier::~CAsyncEventNotifier()</div><div class='ctx'> CloseHandle(m_hEvents[1]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& aType ,</div><div class='ctx'> const uno::Reference< uno::XInterface >& xListener)</div><div class='hunk'>@@ -90,9 +90,9 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&</div><div class='ctx'> m_rBroadcastHelper.aLC.addInterface( aType, xListener );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& aType ,</div><div class='ctx'> const uno::Reference< uno::XInterface >& xListener)</div><div class='hunk'>@@ -105,9 +105,9 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&</div><div class='ctx'> m_rBroadcastHelper.aLC.removeInterface( aType, xListener );</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended)</div><div class='ctx'> {</div><div class='hunk'>@@ -137,9 +137,9 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended)</div><div class='ctx'> return m_bRun;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CAsyncEventNotifier::shutdown()</div><div class='ctx'> {</div><div class='hunk'>@@ -175,27 +175,27 @@ void SAL_CALL CAsyncEventNotifier::shutdown()</div><div class='ctx'> m_hThread = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CAsyncEventNotifier::suspend()</div><div class='ctx'> {</div><div class='ctx'> ResetEvent(m_ResumeNotifying);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void CAsyncEventNotifier::resume()</div><div class='ctx'> {</div><div class='ctx'> SetEvent(m_ResumeNotifying);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotification)</div><div class='ctx'> {</div><div class='hunk'>@@ -210,9 +210,9 @@ void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotifica</div><div class='ctx'> }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> size_t SAL_CALL CAsyncEventNotifier::getEventListSize()</div><div class='ctx'> {</div><div class='hunk'>@@ -220,9 +220,9 @@ size_t SAL_CALL CAsyncEventNotifier::getEventListSize()</div><div class='ctx'> return m_EventList.size();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CAsyncEventNotifier::resetNotifyEvent()</div><div class='ctx'> {</div><div class='hunk'>@@ -231,9 +231,9 @@ void SAL_CALL CAsyncEventNotifier::resetNotifyEvent()</div><div class='ctx'> ResetEvent(m_NotifyEvent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord()</div><div class='ctx'> {</div><div class='hunk'>@@ -241,9 +241,9 @@ CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord()</div><div class='ctx'> return m_EventList.front();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CAsyncEventNotifier::removeNextEventRecord()</div><div class='ctx'> {</div><div class='hunk'>@@ -251,9 +251,9 @@ void SAL_CALL CAsyncEventNotifier::removeNextEventRecord()</div><div class='ctx'> m_EventList.pop_front();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> //</div><div class='del'>-//------------------------------------------------</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> void SAL_CALL CAsyncEventNotifier::run()</div><div class='ctx'> {