diff options
| author | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:03:10 -0500 |
|---|---|---|
| committer | Robinson Tryon <qubit@runcibility.com> | 2015-11-25 06:07:38 -0500 |
| commit | 49c2b9808df8a6b197dec666dfc0cda6321a4306 (patch) | |
| tree | 045ef4b9b8dfdb06bfbe18cdf773d59f57d5552d /sw/source/filter/html/wrthtml.cxx | |
| parent | 5470a365f25e5052b4dd74f76aa2196f0d70934b (diff) | |
bin/rename-sw-abbreviations.sh
libreoffice-5-1-branch-point
This commit renames the most annoying abbreviations in Writer (and
partially in the shared code too).
Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
Diffstat (limited to 'sw/source/filter/html/wrthtml.cxx')
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index f66e87631f12..e741ee631b5a 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -91,7 +91,7 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL ) - : m_pHTMLPosFlyFrms(nullptr) + : m_pHTMLPosFlyFrames(nullptr) , m_pNumRuleInfo(new SwHTMLNumRuleInfo) , m_pNextNumRuleInfo(nullptr) , m_nHTMLMode(0) @@ -378,8 +378,8 @@ sal_uLong SwHTMLWriter::WriteStream() // Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn // das gesamte Dokument geschrieben wird - m_pHTMLPosFlyFrms = nullptr; - CollectFlyFrms(); + m_pHTMLPosFlyFrames = nullptr; + CollectFlyFrames(); m_nLastParaToken = 0; GetControls(); CollectLinkTargets(); @@ -438,12 +438,12 @@ sal_uLong SwHTMLWriter::WriteStream() } // loesche die Tabelle mit den freifliegenden Rahmen - OSL_ENSURE( !m_pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" ); - if( m_pHTMLPosFlyFrms ) + OSL_ENSURE( !m_pHTMLPosFlyFrames, "Wurden nicht alle Rahmen ausgegeben" ); + if( m_pHTMLPosFlyFrames ) { - m_pHTMLPosFlyFrms->DeleteAndDestroyAll(); - delete m_pHTMLPosFlyFrms; - m_pHTMLPosFlyFrms = nullptr; + m_pHTMLPosFlyFrames->DeleteAndDestroyAll(); + delete m_pHTMLPosFlyFrames; + m_pHTMLPosFlyFrames = nullptr; } m_aHTMLControls.DeleteAndDestroyAll(); |