diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 07:59:20 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:52 -0500 |
| commit | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (patch) | |
| tree | c69d5d75274bf3943f98cdb5a661053ece11c1dd /framework | |
| parent | Silence new loplugin:fpcomparison for now (diff) | |
| download | core-6b631a02d36aa09f7c06793e8b4482d3b67ab258.tar.gz core-6b631a02d36aa09f7c06793e8b4482d3b67ab258.zip | |
convert INetURLObject::EncodeMechanism to scoped enum
(cherry picked from commit 803215142efa6437515348f63bd70ffdcf5d45f1)
(cherry picked from commit 736cd289d4cdb0db61d92134bcc9d48aa7e79613)
Change-Id: I50ea17c7779c7b5cacddf548f1773fd7d6c8bade
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/urltransformer.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/fontmenucontroller.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 581c14b0295b..98988a8a8a35 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -264,7 +264,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u aURL.Main = aParser.GetMainURL( INetURLObject::NO_DECODE ); // ...and then WITH parameter and mark. aParser.SetParam( aURL.Arguments); - aParser.SetMark ( aURL.Mark, INetURLObject::ENCODE_ALL ); + aParser.SetMark ( aURL.Mark, INetURLObject::EncodeMechanism::All ); aURL.Complete = aParser.GetMainURL( INetURLObject::NO_DECODE ); // Return "URL is assembled". diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 85711654d147..10232221805e 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -104,7 +104,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq m_xPopupMenu->checkItem( i+1, true ); // use VCL popup menu pointer to set vital information that are not part of the awt implementation OUStringBuffer aCommandBuffer( aFontNameCommandPrefix ); - aCommandBuffer.append( INetURLObject::encode( rName, INetURLObject::PART_HTTP_QUERY, INetURLObject::ENCODE_ALL )); + aCommandBuffer.append( INetURLObject::encode( rName, INetURLObject::PART_HTTP_QUERY, INetURLObject::EncodeMechanism::All )); OUString aFontNameCommand = aCommandBuffer.makeStringAndClear(); pVCLPopupMenu->SetItemCommand( i+1, aFontNameCommand ); // Store font name into item command. } |