diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-29 23:32:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-30 00:07:33 +0200 |
| commit | fc805abce250f68e1d9848b1c127fa673f646715 (patch) | |
| tree | bca5f62ea1210a2b4385c68b7632828ad014cde1 | |
| parent | 396643d46a778539f2bde30569d35ec05d7d867b (diff) | |
sw: un-inline IsConditionalByPoolId
why rebuild half of sw to add a comment?
Change-Id: I72796a704aadc820004f519ed43cb54ba18f918a
| -rw-r--r-- | sw/inc/poolfmt.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/doc/DocumentStylePoolManager.cxx | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index b80e0ed8e6a2..2bc91f47d835 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -401,10 +401,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId ); SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage); -inline bool IsConditionalByPoolId(sal_uInt16 nId) - { - return RES_POOLCOLL_TEXT == nId; - } +bool IsConditionalByPoolId(sal_uInt16 nId); #endif diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index e8d4b6405e0a..d06574e9e39f 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -67,6 +67,14 @@ using namespace ::editeng; using namespace ::com::sun::star; +bool IsConditionalByPoolId(sal_uInt16 nId) +{ + // TODO: why is this style conditional? + // If it is changed to no longer be conditional, then a style "Text Body" + // will be imported without its conditions from ODF. + return RES_POOLCOLL_TEXT == nId; +} + namespace { static const sal_uInt16 PT_3 = 3 * 20; // 3 pt |