mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solenv: fix mkdocs.sh to take into account projects with no inc dir

Browse Source 
Change-Id: I959279c11f0ae5f372936ee3db605716cab37c21
This commit is contained in:
Chris Sherlock 2016-02-05 19:37:05 +11:00
parent 47538ac780
commit e16a07f70a
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
View File

@ -50,7 +50,7 @@ protected:
/** sets the XAccessible which created the context /** sets the XAccessible which created the context
<p>To be called only once, and only if in the ctor NULL was passed.</p> To be called only once, and only if in the ctor NULL was passed.
*/ */
void setCreator( void setCreator(
const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator
@ -61,7 +61,7 @@ protected:
virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing() override;
protected: protected:
// XAccessibleContext ----------------------------------------------------- // XAccessibleContext
/** @return The count of visible children. */ /** @return The count of visible children. */
virtual sal_Int32 SAL_CALL getAccessibleChildCount() virtual sal_Int32 SAL_CALL getAccessibleChildCount()
@ -74,7 +74,7 @@ protected:
throw ( css::lang::IndexOutOfBoundsException, throw ( css::lang::IndexOutOfBoundsException,
css::uno::RuntimeException, std::exception ) override; css::uno::RuntimeException, std::exception ) override;
// XAccessibleComponent --------------------------------------------------- // XAccessibleComponent
/** @return /** @return
The accessible child rendered under the given point. The accessible child rendered under the given point.
@ -88,7 +88,7 @@ protected:
virtual void SAL_CALL grabFocus() virtual void SAL_CALL grabFocus()
throw ( css::uno::RuntimeException, std::exception ) override; throw ( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo ----------------------------------------------------------- // XServiceInfo
/** @return /** @return
The name of this class. The name of this class.
@ -144,7 +144,7 @@ public:
} }
protected: protected:
// internal virtual methods ----------------------------------------------- // internal virtual methods
/** @attention This method requires locked mutex's and a living object. /** @attention This method requires locked mutex's and a living object.
@return The bounding box (VCL rect.) relative to the parent window. */ @return The bounding box (VCL rect.) relative to the parent window. */
@ -153,7 +153,7 @@ protected:
@return The bounding box (VCL rect.) in screen coordinates. */ @return The bounding box (VCL rect.) in screen coordinates. */
virtual Rectangle implGetBoundingBoxOnScreen() override; virtual Rectangle implGetBoundingBoxOnScreen() override;
// internal helper methods ------------------------------------------------ // internal helper methods
/** This method creates (once) and returns the accessible data table child. /** This method creates (once) and returns the accessible data table child.
@attention This method requires locked mutex's and a living object. @attention This method requires locked mutex's and a living object.
@ -181,15 +181,15 @@ protected:
virtual AccessibleBrowseBoxTable* createAccessibleTable(); virtual AccessibleBrowseBoxTable* createAccessibleTable();
private: private:
// members ---------------------------------------------------------------- // members
std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl; std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl;
}; };
/** the XAccessible which creates/returns an AccessibleBrowseBox /** the XAccessible which creates/returns an AccessibleBrowseBox
<p>The instance holds its XAccessibleContext with a hard reference, while The instance holds its XAccessibleContext with a hard reference, while
the context holds this instance weak.</p> the context holds this instance weak.
*/ */
class AccessibleBrowseBoxAccess: class AccessibleBrowseBoxAccess:
public cppu::WeakImplHelper<css::accessibility::XAccessible>, public cppu::WeakImplHelper<css::accessibility::XAccessible>,

7
solenv/bin/mkdocs.sh
View File

@ -119,6 +119,7 @@ if [ -z "$INPUT_PROJECTS" ]; then
INPUT_PROJECTS="`ls */Module_*.mk | sed 's#/.*##'`" INPUT_PROJECTS="`ls */Module_*.mk | sed 's#/.*##'`"
fi fi
# output directory for generated documentation # output directory for generated documentation
BASE_OUTPUT="$1" BASE_OUTPUT="$1"
mkdir -p "$BASE_OUTPUT" || { mkdir -p "$BASE_OUTPUT" || {
@ -163,16 +164,14 @@ do
# project header files can be in $PROJECT/inc and/pr include/$PROJECT # project header files can be in $PROJECT/inc and/pr include/$PROJECT
if [ -d "$PROJECT/inc" ]; then if [ -d "$PROJECT/inc" ]; then
PROJECT_INCLUDE="$PROJECT/inc" PROJECT_INCLUDE="$PROJECT/inc"
else
PROJECT_INCLUDE=""
fi fi
if [ -d "include/$PROJECT" ]; then if [ -d "include/$PROJECT" ]; then
PROJECT_INCLUDE="$PROJECT_INCLUDE include/$PROJECT" PROJECT_INCLUDE="$PROJECT_INCLUDE include/$PROJECT"
fi fi
if [ "$PROJECT" == "vcl" ]; then
PROJECT_INCLUDE="$PROJECT_INCLUDE $PROJECT/source/filter/igif/ $PROJECT/source/filter/ixbm $PROJECT/source/filter/igif/ $PROJECT/source/filter/jpeg"
fi
DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT_INCLUDE"` DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT_INCLUDE"`
DOXYGEN_OUTPUT="$BASE_OUTPUT/$PROJECT" DOXYGEN_OUTPUT="$BASE_OUTPUT/$PROJECT"