Kaydet (Commit) fc805abc authored tarafından Michael Stahl's avatar Michael Stahl

sw: un-inline IsConditionalByPoolId

why rebuild half of sw to add a comment?

Change-Id: I72796a704aadc820004f519ed43cb54ba18f918a
üst 396643d4
...@@ -401,10 +401,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId ); ...@@ -401,10 +401,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId );
SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage); SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage);
inline bool IsConditionalByPoolId(sal_uInt16 nId) bool IsConditionalByPoolId(sal_uInt16 nId);
{
return RES_POOLCOLL_TEXT == nId;
}
#endif #endif
......
...@@ -67,6 +67,14 @@ ...@@ -67,6 +67,14 @@
using namespace ::editeng; using namespace ::editeng;
using namespace ::com::sun::star; 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 namespace
{ {
static const sal_uInt16 PT_3 = 3 * 20; // 3 pt static const sal_uInt16 PT_3 = 3 * 20; // 3 pt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment